{"thread":{"id":"38348","subject":"commit --amend --author error","startedAt":"2015-01-13T08:15:36Z","lastAt":"2015-01-27T12:22:04Z","messageCount":21,"participants":["Gunnar Wagner","Michael J Gruber","Jeff King","Junio C Hamano","Philip Oakley","Eric Sunshine","Ramsay Jones"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"254598","messageId":"54B4D428.2050300@irisgermanica.com","threadId":"38348","inReplyTo":null,"subject":"commit --amend --author error","fromName":"Gunnar Wagner","fromEmail":"gunnar.wagner@irisgermanica.com","sentAt":"2015-01-13T08:15:36Z","receivedAt":"2015-01-13T08:15:36Z","isPatch":false,"sender":{"key":"gunnar.wagner@irisgermanica.com","avatar":null},"body":"I got APGL licensed code from someone else and want to post it on my \ngithub (without taking credit for the work)\n\ntried   git commit --amend --author=\"Author name, www.website.com\" but \ngot an error message which said something like \"original author not found\"\nCan it be that the --amen --author only work if the author is on github \nhimself?\n"},{"id":"254603","messageId":"54B50062.3090209@drmicha.warpmail.net","threadId":"38348","inReplyTo":"54B4D428.2050300@irisgermanica.com","subject":"Re: commit --amend --author error","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2015-01-13T11:24:18Z","receivedAt":"2015-01-13T11:24:18Z","isPatch":false,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Gunnar Wagner schrieb am 13.01.2015 um 09:15:\n> I got APGL licensed code from someone else and want to post it on my \n> github (without taking credit for the work)\n> \n> tried   git commit --amend --author=\"Author name, www.website.com\" but \n> got an error message which said something like \"original author not found\"\n> Can it be that the --amen --author only work if the author is on github \n> himself?\n> \n\nThis has nothing to do with github.\n\nThe author has be in the form \"authorname <authoremail>\". The important\nparts for the format are the <>.\n\nMichael\n"},{"id":"254642","messageId":"20150114120943.GA30383@peff.net","threadId":"38348","inReplyTo":"54B50062.3090209@drmicha.warpmail.net","subject":"Re: commit --amend --author error","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2015-01-14T12:09:43Z","receivedAt":"2015-01-14T12:09:43Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Tue, Jan 13, 2015 at 12:24:18PM +0100, Michael J Gruber wrote:\n\n> Gunnar Wagner schrieb am 13.01.2015 um 09:15:\n> > I got APGL licensed code from someone else and want to post it on my \n> > github (without taking credit for the work)\n> > \n> > tried   git commit --amend --author=\"Author name, www.website.com\" but \n> > got an error message which said something like \"original author not found\"\n> > Can it be that the --amen --author only work if the author is on github \n> > himself?\n> > \n> \n> This has nothing to do with github.\n> \n> The author has be in the form \"authorname <authoremail>\". The important\n> parts for the format are the <>.\n\nYes, but the error message is a hint that there is something else going\non. When there are no angle brackets, some DWIM magic kicks in: git\ntries to find a matching author by walking the project history from\nHEAD. So you can do (in git.git):\n\n  $ git commit --allow-empty -m foo --author=gruber\n  [detached HEAD 73ef08b] foo\n   Author: Michael J Gruber <git@drmicha.warpmail.net>\n\nOf course that does not work if you do not already have commits from the\nperson in your repository:\n\n  $ git commit --allow-empty -m foo --author=foobar\n  fatal: No existing author found with 'foobar'\n\n-Peff\n"},{"id":"254745","messageId":"54B7CCCD.1070708@drmicha.warpmail.net","threadId":"38348","inReplyTo":"20150114120943.GA30383@peff.net","subject":"Re: commit --amend --author error","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2015-01-15T14:21:01Z","receivedAt":"2015-01-15T14:21:01Z","isPatch":false,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Jeff King schrieb am 14.01.2015 um 13:09:\n> On Tue, Jan 13, 2015 at 12:24:18PM +0100, Michael J Gruber wrote:\n> \n>> Gunnar Wagner schrieb am 13.01.2015 um 09:15:\n>>> I got APGL licensed code from someone else and want to post it on my \n>>> github (without taking credit for the work)\n>>>\n>>> tried   git commit --amend --author=\"Author name, www.website.com\" but \n>>> got an error message which said something like \"original author not found\"\n>>> Can it be that the --amen --author only work if the author is on github \n>>> himself?\n>>>\n>>\n>> This has nothing to do with github.\n>>\n>> The author has be in the form \"authorname <authoremail>\". The important\n>> parts for the format are the <>.\n> \n> Yes, but the error message is a hint that there is something else going\n> on. When there are no angle brackets, some DWIM magic kicks in: git\n> tries to find a matching author by walking the project history from\n> HEAD. So you can do (in git.git):\n> \n>   $ git commit --allow-empty -m foo --author=gruber\n>   [detached HEAD 73ef08b] foo\n>    Author: Michael J Gruber <git@drmicha.warpmail.net>\n\n(git commit --allow-almost-empty in the case of that author, hum)\n\n> Of course that does not work if you do not already have commits from the\n> person in your repository:\n> \n>   $ git commit --allow-empty -m foo --author=foobar\n>   fatal: No existing author found with 'foobar'\n> \n> -Peff\n\nThat is the full explanation, yes:\n\nNeither can \"Author name, www.website.com\" be parsed as a complete valid\n\"name <email>\"\nnor can it be matched as part of an existing \"name <email>\" in the repo.\n\nThe OP clearly tried to do the first and got an error message about the\nsecond. Maybe we can do better here?\n\nMichael\n"},{"id":"254746","messageId":"84cf10a22858275d6e213311c93df7f6a5408f60.1421331608.git.git@drmicha.warpmail.net","threadId":"38348","inReplyTo":"54B7CCCD.1070708@drmicha.warpmail.net","subject":"[PATCH] commit: reword --author error message","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2015-01-15T14:23:08Z","receivedAt":"2015-01-15T14:23:08Z","isPatch":true,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"If an --author argument is specified but does not contain a '>' then git tries\nto find the argument within the exiting authors; and gives the error\nmessage \"No existing author found with '%s'\" if there is no match.\n\nThis is confusing for users who try to specify a valid complete author\nname.\n\nRename the error message to make it clearer that the failure has two\nreasons in this case:\n\"Bad --author parameter '%s': neither completely wellformed nor part of\nan existing one\"\n\n(This codepath is touched only when we know already that the argument\ncannot be a completely wellformed author ident.)\n\nSigned-off-by: Michael J Gruber <git@drmicha.warpmail.net>\n---\n builtin/commit.c | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/builtin/commit.c b/builtin/commit.c\nindex 7d90c35..851e2c5 100644\n--- a/builtin/commit.c\n+++ b/builtin/commit.c\n@@ -1056,7 +1056,7 @@ static const char *find_author_by_nickname(const char *name)\n \t\tclear_mailmap(&mailmap);\n \t\treturn strbuf_detach(&buf, NULL);\n \t}\n-\tdie(_(\"No existing author found with '%s'\"), name);\n+\tdie(_(\"Bad --author parameter '%s': neither completely wellformed nor part of an existing one\"), name);\n }\n \n \n-- \n2.3.0.rc0.202.g6f441c7\n"},{"id":"254747","messageId":"54B7CDD4.2010306@drmicha.warpmail.net","threadId":"38348","inReplyTo":"84cf10a22858275d6e213311c93df7f6a5408f60.1421331608.git.git@drmicha.warpmail.net","subject":"Re: [PATCH] commit: reword --author error message","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2015-01-15T14:25:24Z","receivedAt":"2015-01-15T14:25:24Z","isPatch":true,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Michael J Gruber schrieb am 15.01.2015 um 15:23:\n> If an --author argument is specified but does not contain a '>' then git tries\n> to find the argument within the exiting authors; and gives the error\n> message \"No existing author found with '%s'\" if there is no match.\n\nOh well, I'm bracing already for the comments on that entertaining\ntypo... Can I buy an 's', please?\n\n> This is confusing for users who try to specify a valid complete author\n> name.\n> \n> Rename the error message to make it clearer that the failure has two\n> reasons in this case:\n> \"Bad --author parameter '%s': neither completely wellformed nor part of\n> an existing one\"\n> \n> (This codepath is touched only when we know already that the argument\n> cannot be a completely wellformed author ident.)\n> \n> Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>\n> ---\n>  builtin/commit.c | 2 +-\n>  1 file changed, 1 insertion(+), 1 deletion(-)\n> \n> diff --git a/builtin/commit.c b/builtin/commit.c\n> index 7d90c35..851e2c5 100644\n> --- a/builtin/commit.c\n> +++ b/builtin/commit.c\n> @@ -1056,7 +1056,7 @@ static const char *find_author_by_nickname(const char *name)\n>  \t\tclear_mailmap(&mailmap);\n>  \t\treturn strbuf_detach(&buf, NULL);\n>  \t}\n> -\tdie(_(\"No existing author found with '%s'\"), name);\n> +\tdie(_(\"Bad --author parameter '%s': neither completely wellformed nor part of an existing one\"), name);\n>  }\n>  \n>  \n> \n"},{"id":"254748","messageId":"20150115143120.GA16736@peff.net","threadId":"38348","inReplyTo":"84cf10a22858275d6e213311c93df7f6a5408f60.1421331608.git.git@drmicha.warpmail.net","subject":"Re: [PATCH] commit: reword --author error message","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2015-01-15T14:31:21Z","receivedAt":"2015-01-15T14:31:21Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Thu, Jan 15, 2015 at 03:23:08PM +0100, Michael J Gruber wrote:\n\n> If an --author argument is specified but does not contain a '>' then git tries\n> to find the argument within the exiting authors; and gives the error\n> message \"No existing author found with '%s'\" if there is no match.\n> \n> This is confusing for users who try to specify a valid complete author\n> name.\n> \n> Rename the error message to make it clearer that the failure has two\n> reasons in this case:\n> \"Bad --author parameter '%s': neither completely wellformed nor part of\n> an existing one\"\n\nI really like the intent of this patch, but I actually find the new\nmessage even more confusing.\n\nIs this a time when we could use hint() to give a multi-line explanation\n(and probably a matching advice.* config)? Like:\n\n  hint: If the --author parameter contains angle brackets (\"<>\"), it\n  hint: is treated as a literal name/email pair to use. If not, then\n  hint: the history is searched for an existing matching author.\n\nor something?\n\n-Peff\n"},{"id":"254749","messageId":"54B7D166.8090608@drmicha.warpmail.net","threadId":"38348","inReplyTo":"20150115143120.GA16736@peff.net","subject":"Re: [PATCH] commit: reword --author error message","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2015-01-15T14:40:38Z","receivedAt":"2015-01-15T14:40:38Z","isPatch":true,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Jeff King schrieb am 15.01.2015 um 15:31:\n> On Thu, Jan 15, 2015 at 03:23:08PM +0100, Michael J Gruber wrote:\n> \n>> If an --author argument is specified but does not contain a '>' then git tries\n>> to find the argument within the exiting authors; and gives the error\n>> message \"No existing author found with '%s'\" if there is no match.\n>>\n>> This is confusing for users who try to specify a valid complete author\n>> name.\n>>\n>> Rename the error message to make it clearer that the failure has two\n>> reasons in this case:\n>> \"Bad --author parameter '%s': neither completely wellformed nor part of\n>> an existing one\"\n> \n> I really like the intent of this patch, but I actually find the new\n> message even more confusing.\n\nThe main observation is that the current error message is given only\nwhen both interpretations (complete ident, match ident) fail, and the\nerror message conveys only one when it should do both. I don't care\nabout the wording either.\n\n> Is this a time when we could use hint() to give a multi-line explanation\n> (and probably a matching advice.* config)? Like:\n> \n>   hint: If the --author parameter contains angle brackets (\"<>\"), it\n>   hint: is treated as a literal name/email pair to use. If not, then\n>   hint: the history is searched for an existing matching author.\n> \n> or something?\n> \n> -Peff\n> \n\nWell, this basically copies the man page paragraph for that option. I\ndon't want to set a(nother) precedent for doing this and create yet\nanother config knob.\n\nThe alternative would be to just say \"Bad --author parameter '%s'\" (or\n\"Invalid...\"), as we do in most cases, and force the user to check the\nman page for the definition of \"valid\". I'm beginning to prefer this\nminimalistic approach...\n\nMichael\n"},{"id":"254758","messageId":"xmqq4mrs7x5h.fsf@gitster.dls.corp.google.com","threadId":"38348","inReplyTo":"84cf10a22858275d6e213311c93df7f6a5408f60.1421331608.git.git@drmicha.warpmail.net","subject":"Re: [PATCH] commit: reword --author error message","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2015-01-15T17:48:26Z","receivedAt":"2015-01-15T17:48:26Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Michael J Gruber <git@drmicha.warpmail.net> writes:\n\n> If an --author argument is specified but does not contain a '>' then git tries\n> to find the argument within the exiting authors; and gives the error\n> message \"No existing author found with '%s'\" if there is no match.\n>\n> This is confusing for users who try to specify a valid complete author\n> name.\n\nI suspect that you meant s/a valid/an invalid/, as if it is valid,\nit cannot not contain '>' (after all, '>' is merely a rough\napproximation to check if it is \"Name <email>\" format).\n\n> Rename the error message to make it clearer that the failure has two\n> reasons in this case:\n> \"Bad --author parameter '%s': neither completely wellformed nor part of\n> an existing one\"\n\nYou are trying to help a user who thought \"Who www.where.com\" was a\nvalid thing to pass to --author; \"it is not completely wellformed\"\nis not very helpful without making her realize what in that bogus\nstring is not \"completely well-formed\".\n\nPerhaps\n\n  \"--author '%s' is not 'Name <email>' and no existing author matches that string\"\n\nor somesuch?\n"},{"id":"254814","messageId":"20150116093220.GA3006@peff.net","threadId":"38348","inReplyTo":"xmqq4mrs7x5h.fsf@gitster.dls.corp.google.com","subject":"Re: [PATCH] commit: reword --author error message","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2015-01-16T09:32:21Z","receivedAt":"2015-01-16T09:32:21Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Thu, Jan 15, 2015 at 09:48:26AM -0800, Junio C Hamano wrote:\n\n> > Rename the error message to make it clearer that the failure has two\n> > reasons in this case:\n> > \"Bad --author parameter '%s': neither completely wellformed nor part of\n> > an existing one\"\n> \n> You are trying to help a user who thought \"Who www.where.com\" was a\n> valid thing to pass to --author; \"it is not completely wellformed\"\n> is not very helpful without making her realize what in that bogus\n> string is not \"completely well-formed\".\n> \n> Perhaps\n> \n>   \"--author '%s' is not 'Name <email>' and no existing author matches that string\"\n> \n> or somesuch?\n\nYeah, I think that is OK. It is kind of clunky to read, but it contains\nall of the necessary information to lead the user in the right\ndirection.\n\n-Peff\n"},{"id":"254819","messageId":"xmqqwq4m3a8k.fsf@gitster.dls.corp.google.com","threadId":"38348","inReplyTo":"20150116093220.GA3006@peff.net","subject":"Re: [PATCH] commit: reword --author error message","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2015-01-16T17:29:15Z","receivedAt":"2015-01-16T17:29:15Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jeff King <peff@peff.net> writes:\n\n> On Thu, Jan 15, 2015 at 09:48:26AM -0800, Junio C Hamano wrote:\n>\n>> > Rename the error message to make it clearer that the failure has two\n>> > reasons in this case:\n>> > \"Bad --author parameter '%s': neither completely wellformed nor part of\n>> > an existing one\"\n>> \n>> You are trying to help a user who thought \"Who www.where.com\" was a\n>> valid thing to pass to --author; \"it is not completely wellformed\"\n>> is not very helpful without making her realize what in that bogus\n>> string is not \"completely well-formed\".\n>> \n>> Perhaps\n>> \n>>   \"--author '%s' is not 'Name <email>' and no existing author matches that string\"\n>> \n>> or somesuch?\n>\n> Yeah, I think that is OK. It is kind of clunky to read, but it contains\n> all of the necessary information to lead the user in the right\n> direction.\n\nIndeed it is clunky and not in the usual format.\n\nThis might be better, perhaps?\n\n    die(_(\"--author '%s': not 'Name <email>' and matches no existing author\"));\n"},{"id":"254821","messageId":"C67968DA2DD34039AF6EC8B61AA1CA47@PhilipOakley","threadId":"38348","inReplyTo":"xmqqwq4m3a8k.fsf@gitster.dls.corp.google.com","subject":"Re: [PATCH] commit: reword --author error message","fromName":"Philip Oakley","fromEmail":"philipoakley@iee.org","sentAt":null,"receivedAt":"2015-01-16T18:32:09Z","isPatch":true,"sender":{"key":"philipoakley@iee.email","avatar":"https://avatars.githubusercontent.com/u/914343?v=4"},"body":"From: \"Junio C Hamano\" <gitster@pobox.com>\n> Jeff King <peff@peff.net> writes:\n>\n>> On Thu, Jan 15, 2015 at 09:48:26AM -0800, Junio C Hamano wrote:\n>>\n>>> > Rename the error message to make it clearer that the failure has \n>>> > two\n>>> > reasons in this case:\n>>> > \"Bad --author parameter '%s': neither completely wellformed nor \n>>> > part of\n>>> > an existing one\"\n>>>\n>>> You are trying to help a user who thought \"Who www.where.com\" was a\n>>> valid thing to pass to --author; \"it is not completely wellformed\"\n>>> is not very helpful without making her realize what in that bogus\n>>> string is not \"completely well-formed\".\n>>>\n>>> Perhaps\n>>>\n>>>   \"--author '%s' is not 'Name <email>' and no existing author \n>>> matches that string\"\n>>>\n>>> or somesuch?\n>>\n>> Yeah, I think that is OK. It is kind of clunky to read, but it \n>> contains\n>> all of the necessary information to lead the user in the right\n>> direction.\n>\n> Indeed it is clunky and not in the usual format.\n>\n> This might be better, perhaps?\n>\n>    die(_(\"--author '%s': not 'Name <email>' and matches no existing \n> author\"));\n/Bikeshed\n     die(_(\"--author '%s': not 'Name <email>', nor matches any existing \nauthor\"));\nThe 'not/and' construct didn't feel right here in the UK, but then many \ndon't understand 'nor' either.\n--\nPhilip\n"},{"id":"254822","messageId":"xmqqbnly376a.fsf@gitster.dls.corp.google.com","threadId":"38348","inReplyTo":"C67968DA2DD34039AF6EC8B61AA1CA47@PhilipOakley","subject":"Re: [PATCH] commit: reword --author error message","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2015-01-16T18:35:25Z","receivedAt":"2015-01-16T18:35:25Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Philip Oakley\" <philipoakley@iee.org> writes:\n\n>     die(_(\"--author '%s': not 'Name <email>', nor matches any existing\n> author\"));\n\nSounds good.  Thanks.\n"},{"id":"254831","messageId":"CAPig+cR4vaYe+KiJthmpzo3p7JQyGgEDBqqLP0nBM3YjXXZywQ@mail.gmail.com","threadId":"38348","inReplyTo":"xmqqbnly376a.fsf@gitster.dls.corp.google.com","subject":"Re: [PATCH] commit: reword --author error message","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2015-01-16T19:37:20Z","receivedAt":"2015-01-16T19:37:20Z","isPatch":true,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"On Fri, Jan 16, 2015 at 1:35 PM, Junio C Hamano <gitster@pobox.com> wrote:\n> \"Philip Oakley\" <philipoakley@iee.org> writes:\n>\n>>     die(_(\"--author '%s': not 'Name <email>', nor matches any existing\n>> author\"));\n>\n> Sounds good.  Thanks.\n\nTo further bikeshed (particularly if \"nor\" is in the mix):\n\n    neither 'Name <email>' nor a match for an existing author\n"},{"id":"254835","messageId":"xmqqfvba1p07.fsf@gitster.dls.corp.google.com","threadId":"38348","inReplyTo":"CAPig+cR4vaYe+KiJthmpzo3p7JQyGgEDBqqLP0nBM3YjXXZywQ@mail.gmail.com","subject":"Re: [PATCH] commit: reword --author error message","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2015-01-16T19:53:12Z","receivedAt":"2015-01-16T19:53:12Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Eric Sunshine <sunshine@sunshineco.com> writes:\n\n> On Fri, Jan 16, 2015 at 1:35 PM, Junio C Hamano <gitster@pobox.com> wrote:\n>> \"Philip Oakley\" <philipoakley@iee.org> writes:\n>>\n>>>     die(_(\"--author '%s': not 'Name <email>', nor matches any existing\n>>> author\"));\n>>\n>> Sounds good.  Thanks.\n>\n> To further bikeshed (particularly if \"nor\" is in the mix):\n>\n>     neither 'Name <email>' nor a match for an existing author\n\nShort and sweet ;-)\n"},{"id":"255291","messageId":"7e2e1d1e7f4a25d84a6f7a1c0cb035221529f189.1422286879.git.git@drmicha.warpmail.net","threadId":"38348","inReplyTo":"xmqqfvba1p07.fsf@gitster.dls.corp.google.com","subject":"[PATCHv2] commit: reword --author error message","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2015-01-26T15:48:33Z","receivedAt":"2015-01-26T15:48:33Z","isPatch":false,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"If an --author argument is specified but does not contain a '>' then git tries\nto find the argument within the existing authors; and gives the error\nmessage \"No existing author found with '%s'\" if there is no match.\n\nThis is confusing for users who try to specify a valid complete author\nname.\n\nRename the error message to make it clearer that the failure has two\nreasons in this case.\n\n(This codepath is touched only when we know already that the argument\ncannot be a completely wellformed author ident.)\n\nSigned-off-by: Michael J Gruber <git@drmicha.warpmail.net>\n---\nThere's really not much by me in this patch any more...\nEveryone on cc contributed - bikeshedding in its best, productive form!\n\nBTW: How do you pull cc/msgid from the list into format-patch/send-email most effectively?\n(granted that I move away from gmane/nntp, which is likely)\n\n builtin/commit.c | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/builtin/commit.c b/builtin/commit.c\nindex 7d90c35..240423b 100644\n--- a/builtin/commit.c\n+++ b/builtin/commit.c\n@@ -1056,7 +1056,7 @@ static const char *find_author_by_nickname(const char *name)\n \t\tclear_mailmap(&mailmap);\n \t\treturn strbuf_detach(&buf, NULL);\n \t}\n-\tdie(_(\"No existing author found with '%s'\"), name);\n+\tdie(_(\"--author '%s': neither 'Name <email>' nor a match for an existing author\"), name);\n }\n \n \n-- \n2.3.0.rc1.222.gae238f2\n"},{"id":"255300","messageId":"20150126190711.GA13582@peff.net","threadId":"38348","inReplyTo":"7e2e1d1e7f4a25d84a6f7a1c0cb035221529f189.1422286879.git.git@drmicha.warpmail.net","subject":"Re: [PATCHv2] commit: reword --author error message","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2015-01-26T19:07:12Z","receivedAt":"2015-01-26T19:07:12Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Mon, Jan 26, 2015 at 04:48:33PM +0100, Michael J Gruber wrote:\n\n> -\tdie(_(\"No existing author found with '%s'\"), name);\n> +\tdie(_(\"--author '%s': neither 'Name <email>' nor a match for an existing author\"), name);\n\nI had to add to the bikeshed, but I had to read this several times to\nmake sense of it. It is grammatically:\n\n  X [is] neither Y nor Z\n\nexcept that by eliding the verb (\"is\"), I somehow had trouble making\nsense of Z (\"a match...\") as a noun.\n\nI came up with:\n\n  --author '%s': neither 'Name <email>' nor matches an existing author\n\nonly to see that it was suggested earlier in the thread as a predecessor\nto this. ;)\n\nI wonder if adding back in the missing verb, rather than a colon, would\nalso make more sense:\n\n  --author '%s' is neither 'Name <email>' nor a match for an existing author\n\n> BTW: How do you pull cc/msgid from the list into format-patch/send-email most effectively?\n> (granted that I move away from gmane/nntp, which is likely)\n\nHere's what I do:\n\n  http://article.gmane.org/gmane.comp.version-control.git/262367\n\n-Peff\n"},{"id":"255312","messageId":"xmqqlhkplz8d.fsf@gitster.dls.corp.google.com","threadId":"38348","inReplyTo":"20150126190711.GA13582@peff.net","subject":"Re: [PATCHv2] commit: reword --author error message","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2015-01-27T02:43:46Z","receivedAt":"2015-01-27T02:43:46Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jeff King <peff@peff.net> writes:\n\n> ... I somehow had trouble making\n> sense of Z (\"a match...\") as a noun.\n\n> I wonder if adding back in the missing verb, rather than a colon, would\n> also make more sense:\n>\n>   --author '%s' is neither 'Name <email>' nor a match for an existing author\n\nThen\n\n>   --author '%s' is not 'Name <email>' and matches no existing author\n\nwould be the shortest, sweetest and hopefully grammatical, perhaps?\n"},{"id":"255313","messageId":"20150127024553.GA24569@peff.net","threadId":"38348","inReplyTo":"xmqqlhkplz8d.fsf@gitster.dls.corp.google.com","subject":"Re: [PATCHv2] commit: reword --author error message","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2015-01-27T02:45:54Z","receivedAt":"2015-01-27T02:45:54Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Mon, Jan 26, 2015 at 06:43:46PM -0800, Junio C Hamano wrote:\n\n> Jeff King <peff@peff.net> writes:\n> \n> > ... I somehow had trouble making\n> > sense of Z (\"a match...\") as a noun.\n> \n> > I wonder if adding back in the missing verb, rather than a colon, would\n> > also make more sense:\n> >\n> >   --author '%s' is neither 'Name <email>' nor a match for an existing author\n> \n> Then\n> \n> >   --author '%s' is not 'Name <email>' and matches no existing author\n> \n> would be the shortest, sweetest and hopefully grammatical, perhaps?\n\nYes, that one make perfect sense to me.\n\n-Peff\n"},{"id":"255319","messageId":"A36392C1208647BC9F2CA89478DCC754@PhilipOakley","threadId":"38348","inReplyTo":"20150127024553.GA24569@peff.net","subject":"Re: [PATCHv2] commit: reword --author error message","fromName":"Philip Oakley","fromEmail":"philipoakley@iee.org","sentAt":null,"receivedAt":"2015-01-27T07:26:07Z","isPatch":false,"sender":{"key":"philipoakley@iee.email","avatar":"https://avatars.githubusercontent.com/u/914343?v=4"},"body":"From: \"Jeff King\" <peff@peff.net>\n> On Mon, Jan 26, 2015 at 06:43:46PM -0800, Junio C Hamano wrote:\n>\n>> Jeff King <peff@peff.net> writes:\n>>\n>> > ... I somehow had trouble making\n>> > sense of Z (\"a match...\") as a noun.\n>>\n>> > I wonder if adding back in the missing verb, rather than a colon, \n>> > would\n>> > also make more sense:\n>> >\n>> >   --author '%s' is neither 'Name <email>' nor a match for an \n>> > existing author\n>>\n>> Then\n>>\n>> >   --author '%s' is not 'Name <email>' and matches no existing \n>> > author\n>>\n>> would be the shortest, sweetest and hopefully grammatical, perhaps?\n>\n> Yes, that one make perfect sense to me.\n>\nAgreed.\nPhilip\n"},{"id":"255322","messageId":"54C782EC.3020309@ramsay1.demon.co.uk","threadId":"38348","inReplyTo":"20150126190711.GA13582@peff.net","subject":"Re: [PATCHv2] commit: reword --author error message","fromName":"Ramsay Jones","fromEmail":"ramsay@ramsay1.demon.co.uk","sentAt":"2015-01-27T12:22:04Z","receivedAt":"2015-01-27T12:22:04Z","isPatch":false,"sender":{"key":"ramsay@ramsayjones.plus.com","avatar":"https://avatars.githubusercontent.com/u/33702710?v=4"},"body":"On 26/01/15 19:07, Jeff King wrote:\n> On Mon, Jan 26, 2015 at 04:48:33PM +0100, Michael J Gruber wrote:\n> \n>> -\tdie(_(\"No existing author found with '%s'\"), name);\n>> +\tdie(_(\"--author '%s': neither 'Name <email>' nor a match for an existing author\"), name);\n> \n> I had to add to the bikeshed, but I had to read this several times to\n> make sense of it. It is grammatically:\n> \n>   X [is] neither Y nor Z\n> \n> except that by eliding the verb (\"is\"), I somehow had trouble making\n> sense of Z (\"a match...\") as a noun.\n> \n> I came up with:\n> \n>   --author '%s': neither 'Name <email>' nor matches an existing author\n> \n> only to see that it was suggested earlier in the thread as a predecessor\n> to this. ;)\n> \n> I wonder if adding back in the missing verb, rather than a colon, would\n> also make more sense:\n> \n>   --author '%s' is neither 'Name <email>' nor a match for an existing author\n> \n\nI usually don't like to add anything to the bikeshed, but ...\n\nThis sounds odd to me, so maybe:\n\n  --author '%s' is neither in the form of 'Name <email>' nor a match for an existing author\n\nalthough that is getting a bit long! :-D\n\nATB,\nRamsay Jones\n"}]}