{"thread":{"id":"38972","subject":"[PATCH] checkout: Say “it” instead of “them” for one commit","startedAt":"2015-04-01T17:38:00Z","lastAt":"2015-04-02T23:14:50Z","messageCount":3,"participants":["Thomas Schneider","Jonathan Nieder"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"258832","messageId":"1427909880-9846-1-git-send-email-thosch97@gmail.com","threadId":"38972","inReplyTo":null,"subject":"[PATCH] checkout: Say “it” instead of “them” for one commit","fromName":"Thomas Schneider","fromEmail":"thosch97@gmail.com","sentAt":"2015-04-01T17:38:00Z","receivedAt":"2015-04-01T17:38:00Z","isPatch":true,"sender":{"key":"thosch97@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1690172?v=4"},"body":"When detached and checking out a branch again, git checkout warns about\ncommit(s) that might get lost.  It used to say “If you want to keep them\n[…]” even for only one commit.\n\nSigned-off-by: Thomas Schneider <thosch97@gmail.com>\n---\n builtin/checkout.c | 11 +++++++++--\n 1 file changed, 9 insertions(+), 2 deletions(-)\n\ndiff --git a/builtin/checkout.c b/builtin/checkout.c\nindex 3e141fc..4aad49a 100644\n--- a/builtin/checkout.c\n+++ b/builtin/checkout.c\n@@ -743,10 +743,17 @@ static void suggest_reattach(struct commit *commit, struct rev_info *revs)\n \n \tif (advice_detached_head)\n \t\tfprintf(stderr,\n-\t\t\t_(\n+\t\t\tQ_(\n+\t\t\t/* The singular version */\n+\t\t\t\"If you want to keep it by creating a new branch, \"\n+\t\t\t\"this may be a good time\\nto do so with:\\n\\n\"\n+\t\t\t\" git branch <new-branch-name> %s\\n\\n\",\n+\t\t\t/* The plural version */\n \t\t\t\"If you want to keep them by creating a new branch, \"\n \t\t\t\"this may be a good time\\nto do so with:\\n\\n\"\n-\t\t\t\" git branch <new-branch-name> %s\\n\\n\"),\n+\t\t\t\" git branch <new-branch-name> %s\\n\\n\",\n+\t\t\t/* Give ngettext() the count */\n+\t\t\tlost),\n \t\t\tfind_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV));\n }\n \n-- \n2.1.0\n"},{"id":"258835","messageId":"20150401194310.GH22844@google.com","threadId":"38972","inReplyTo":"1427909880-9846-1-git-send-email-thosch97@gmail.com","subject":"Re: [PATCH] checkout: Say “it” instead of “them” for one commit","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2015-04-01T19:43:11Z","receivedAt":"2015-04-01T19:43:11Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Hi,\n\nThomas Schneider wrote:\n\n> When detached and checking out a branch again, git checkout warns about\n> commit(s) that might get lost.  It used to say “If you want to keep them\n> […]” even for only one commit.\n>\n> Signed-off-by: Thomas Schneider <thosch97@gmail.com>\n\nMakes sense.\n\n[...]\n> --- a/builtin/checkout.c\n> +++ b/builtin/checkout.c\n> @@ -743,10 +743,17 @@ static void suggest_reattach(struct commit *commit, struct rev_info *revs)\n>  \n>  \tif (advice_detached_head)\n>  \t\tfprintf(stderr,\n> -\t\t\t_(\n> +\t\t\tQ_(\n> +\t\t\t/* The singular version */\n> +\t\t\t\"If you want to keep it by creating a new branch, \"\n> +\t\t\t\"this may be a good time\\nto do so with:\\n\\n\"\n> +\t\t\t\" git branch <new-branch-name> %s\\n\\n\",\n> +\t\t\t/* The plural version */\n>  \t\t\t\"If you want to keep them by creating a new branch, \"\n>  \t\t\t\"this may be a good time\\nto do so with:\\n\\n\"\n> -\t\t\t\" git branch <new-branch-name> %s\\n\\n\"),\n> +\t\t\t\" git branch <new-branch-name> %s\\n\\n\",\n> +\t\t\t/* Give ngettext() the count */\n> +\t\t\tlost),\n>  \t\t\tfind_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV));\n\nThe comments for /* singular */, /* plural */, and /* count */ seem\nredundant and distracting to me, but since we have the same comments a\nfew lines before, keeping it consistent is the right thing to do.\n\nFor what it's worth,\nReviewed-by: Jonathan Nieder <jrnieder@gmail.com>\n"},{"id":"258909","messageId":"CAJUTLVXFRRYmDdM5eHj9h0+0E6gjamtwP_SZjSmXpEkyrTH8Cw@mail.gmail.com","threadId":"38972","inReplyTo":"20150401194310.GH22844@google.com","subject":"Re: [PATCH] checkout: Say “it” instead of “them” for one commit","fromName":"Thomas Schneider","fromEmail":"thosch97@gmail.com","sentAt":"2015-04-02T23:14:50Z","receivedAt":"2015-04-02T23:14:50Z","isPatch":true,"sender":{"key":"thosch97@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1690172?v=4"},"body":"Junio –\n\nI see you changed my commit message a bit, but some mistakes seem to\nhave slipped in:\n> checkout: call a single commit “it” instead of “th\n“them” was cut off, including the trailing quotation mark.\n[…]\n> them ...\"” even for only one commit.\nTwo quotation marks?\n\nI always use the “right” quotation marks instead of \" or ' and “…”\ninstead of “...”, should I have used the latter ones?\n\nThanks,\nThomas\n"}]}