diff options
| author |  Michael J Gruber <git@drmicha.warpmail.net> | 2015-01-26 16:48:33 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2015-01-26 19:57:12 -0800 |
| commit | 1044b1f6a1a56ae723fd19cddd769380dc775f48 (patch) | |
| tree | b1589aae5e827f605500710dd110582ac5ab9409 | |
| parent | Merge branch 'maint-1.9' into maint-2.0 (diff) | |
| download | tgif-1044b1f6a1a56ae723fd19cddd769380dc775f48.tar.xz | |
commit: reword --author error message
If an --author argument is specified but does not contain a '>' then git tries
to find the argument within the existing authors; and gives the error
message "No existing author found with '%s'" if there is no match.
This is confusing for users who try to specify a valid complete author
name.
Rename the error message to make it clearer that the failure has two
reasons in this case.
(This codepath is touched only when we know already that the argument
cannot be a completely wellformed author ident.)
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Helped-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/commit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index 39cf8976e3..304c0bf45c 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -999,7 +999,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); } |