mirror of
https://github.com/git/git
synced 2024-09-13 21:34:42 +00:00
Merge branch 'sv/typofix-apply-error-message'
* sv/typofix-apply-error-message: apply: fix typo in an error message
This commit is contained in:
commit
aa6bdbb62f
|
@ -3728,7 +3728,7 @@ static void build_fake_ancestor(struct patch *list, const char *filename)
|
||||||
if (!preimage_sha1_in_gitlink_patch(patch, sha1))
|
if (!preimage_sha1_in_gitlink_patch(patch, sha1))
|
||||||
; /* ok, the textual part looks sane */
|
; /* ok, the textual part looks sane */
|
||||||
else
|
else
|
||||||
die("sha1 information is lacking or useless for submoule %s",
|
die("sha1 information is lacking or useless for submodule %s",
|
||||||
name);
|
name);
|
||||||
} else if (!get_sha1_blob(patch->old_sha1_prefix, sha1)) {
|
} else if (!get_sha1_blob(patch->old_sha1_prefix, sha1)) {
|
||||||
; /* ok */
|
; /* ok */
|
||||||
|
|
Loading…
Reference in a new issue