Re: [PATCHv2] commit: reword --author error message
On 26/01/15 19:07, Jeff King wrote: On Mon, Jan 26, 2015 at 04:48:33PM +0100, Michael J Gruber wrote: -die(_(No existing author found with '%s'), name); +die(_(--author '%s': neither 'Name email' nor a match for an existing author), name); I had to add to the bikeshed, but I had to read this several times to make sense of it. It is grammatically: X [is] neither Y nor Z except that by eliding the verb (is), I somehow had trouble making sense of Z (a match...) as a noun. I came up with: --author '%s': neither 'Name email' nor matches an existing author only to see that it was suggested earlier in the thread as a predecessor to this. ;) I wonder if adding back in the missing verb, rather than a colon, would also make more sense: --author '%s' is neither 'Name email' nor a match for an existing author I usually don't like to add anything to the bikeshed, but ... This sounds odd to me, so maybe: --author '%s' is neither in the form of 'Name email' nor a match for an existing author although that is getting a bit long! :-D ATB, Ramsay Jones -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCHv2] commit: reword --author error message
From: Jeff King p...@peff.net On Mon, Jan 26, 2015 at 06:43:46PM -0800, Junio C Hamano wrote: Jeff King p...@peff.net writes: ... I somehow had trouble making sense of Z (a match...) as a noun. I wonder if adding back in the missing verb, rather than a colon, would also make more sense: --author '%s' is neither 'Name email' nor a match for an existing author Then --author '%s' is not 'Name email' and matches no existing author would be the shortest, sweetest and hopefully grammatical, perhaps? Yes, that one make perfect sense to me. Agreed. Philip -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCHv2] 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 g...@drmicha.warpmail.net --- There's really not much by me in this patch any more... Everyone on cc contributed - bikeshedding in its best, productive form! BTW: How do you pull cc/msgid from the list into format-patch/send-email most effectively? (granted that I move away from gmane/nntp, which is likely) builtin/commit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/commit.c b/builtin/commit.c index 7d90c35..240423b 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -1056,7 +1056,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': neither 'Name email' nor a match for an existing author), name); } -- 2.3.0.rc1.222.gae238f2 -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCHv2] commit: reword --author error message
On Mon, Jan 26, 2015 at 04:48:33PM +0100, Michael J Gruber wrote: - die(_(No existing author found with '%s'), name); + die(_(--author '%s': neither 'Name email' nor a match for an existing author), name); I had to add to the bikeshed, but I had to read this several times to make sense of it. It is grammatically: X [is] neither Y nor Z except that by eliding the verb (is), I somehow had trouble making sense of Z (a match...) as a noun. I came up with: --author '%s': neither 'Name email' nor matches an existing author only to see that it was suggested earlier in the thread as a predecessor to this. ;) I wonder if adding back in the missing verb, rather than a colon, would also make more sense: --author '%s' is neither 'Name email' nor a match for an existing author BTW: How do you pull cc/msgid from the list into format-patch/send-email most effectively? (granted that I move away from gmane/nntp, which is likely) Here's what I do: http://article.gmane.org/gmane.comp.version-control.git/262367 -Peff -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCHv2] commit: reword --author error message
Jeff King p...@peff.net writes: ... I somehow had trouble making sense of Z (a match...) as a noun. I wonder if adding back in the missing verb, rather than a colon, would also make more sense: --author '%s' is neither 'Name email' nor a match for an existing author Then --author '%s' is not 'Name email' and matches no existing author would be the shortest, sweetest and hopefully grammatical, perhaps? -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCHv2] commit: reword --author error message
On Mon, Jan 26, 2015 at 06:43:46PM -0800, Junio C Hamano wrote: Jeff King p...@peff.net writes: ... I somehow had trouble making sense of Z (a match...) as a noun. I wonder if adding back in the missing verb, rather than a colon, would also make more sense: --author '%s' is neither 'Name email' nor a match for an existing author Then --author '%s' is not 'Name email' and matches no existing author would be the shortest, sweetest and hopefully grammatical, perhaps? Yes, that one make perfect sense to me. -Peff -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
