Skip to content

Commit

Permalink
Merge branch 'sv/typofix-apply-error-message'
Browse files Browse the repository at this point in the history
* sv/typofix-apply-error-message:
  apply: fix typo in an error message
  • Loading branch information
Junio C Hamano committed Dec 12, 2014
2 parents b690b87 + bcd46be commit aa6bdbb
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion builtin/apply.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down

0 comments on commit aa6bdbb

Please sign in to comment.