summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-12-12 22:31:35 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-12-12 22:31:35 (GMT)
commitaa6bdbb62fd44ff45a871add60b5b104f9382f29 (patch)
tree66308b806008e4ea5a3ba977c7bf384e02d7f5f5
parentb690b87ce3e52d54da4c5dd522a9a7dd08515ae5 (diff)
parentbcd46becbc115f8a1a9bfe3f83efa462547aa231 (diff)
downloadgit-aa6bdbb62fd44ff45a871add60b5b104f9382f29.zip
git-aa6bdbb62fd44ff45a871add60b5b104f9382f29.tar.gz
git-aa6bdbb62fd44ff45a871add60b5b104f9382f29.tar.bz2
Merge branch 'sv/typofix-apply-error-message'
* sv/typofix-apply-error-message: apply: fix typo in an error message
-rw-r--r--builtin/apply.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/apply.c b/builtin/apply.c
index 6696ea4..28d24f8 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -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 */