summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-02-17 18:15:23 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-02-17 18:15:23 (GMT)
commitd7c8b33a35ad4f081dfcf231ea7dabf4ed88c889 (patch)
tree716f15efd192c8d5012883d9cf21e980c452ee1a
parenta23069ce045b271de98aff257ca68cc1952cc571 (diff)
parent1044b1f6a1a56ae723fd19cddd769380dc775f48 (diff)
downloadgit-d7c8b33a35ad4f081dfcf231ea7dabf4ed88c889.zip
git-d7c8b33a35ad4f081dfcf231ea7dabf4ed88c889.tar.gz
git-d7c8b33a35ad4f081dfcf231ea7dabf4ed88c889.tar.bz2
Merge branch 'mg/commit-author-no-match-malformed-message'
The error message from "git commit", when a non-existing author name was given as value to the "--author=" parameter, has been reworded to avoid misunderstanding. * mg/commit-author-no-match-malformed-message: commit: reword --author error message
-rw-r--r--builtin/commit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/commit.c b/builtin/commit.c
index 7f46713..6055c76 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -1050,7 +1050,7 @@ static const char *find_author_by_nickname(const char *name)
clear_mailmap(&mailmap);
return strbuf_detach(&buf, NULL);
}
- die(_("No existing author found with '%s'"), name);
+ die(_("--author '%s' is not 'Name <email>' and matches no existing author"), name);
}