Merge branch 'sv/typofix-apply-error-message'

* sv/typofix-apply-error-message:
  apply: fix typo in an error message
This commit is contained in:
Junio C Hamano 2014-12-12 14:31:35 -08:00
commit aa6bdbb62f

View file

@ -3728,7 +3728,7 @@ static void build_fake_ancestor(struct patch *list, const char *filename)
if (!preimage_sha1_in_gitlink_patch(patch, sha1))
; /* ok, the textual part looks sane */
else
die("sha1 information is lacking or useless for submoule %s",
die("sha1 information is lacking or useless for submodule %s",
name);
} else if (!get_sha1_blob(patch->old_sha1_prefix, sha1)) {
; /* ok */