{"thread":{"id":"44593","subject":"[PATCH] unpack-trees: fix grammar for untracked files in directories","startedAt":"2016-12-02T19:17:57Z","lastAt":"2016-12-02T19:23:30Z","messageCount":2,"participants":["Stefan Beller","David Turner"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"306803","messageId":"20161202191741.12693-1-sbeller@google.com","threadId":"44593","inReplyTo":null,"subject":"[PATCH] unpack-trees: fix grammar for untracked files in directories","fromName":"Stefan Beller","fromEmail":"sbeller@google.com","sentAt":"2016-12-02T19:17:41Z","receivedAt":"2016-12-02T19:17:57Z","isPatch":true,"sender":{"key":"stefanbeller@gmail.com","avatar":"https://avatars.githubusercontent.com/u/455868?v=4"},"body":"Noticed-by: David Turner <dturner@twosigma.com>\nSigned-off-by: Stefan Beller <sbeller@google.com>\n---\n\nThis was noticed by David when reviewing the submodule checkout series,\nthough rolling this as an independent fix is better :)\n\nThanks,\nStefan\n\n t/t7609-merge-co-error-msgs.sh | 2 +-\n unpack-trees.c                 | 2 +-\n 2 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/t/t7609-merge-co-error-msgs.sh b/t/t7609-merge-co-error-msgs.sh\nindex f80bdb81e1..e90413204e 100755\n--- a/t/t7609-merge-co-error-msgs.sh\n+++ b/t/t7609-merge-co-error-msgs.sh\n@@ -105,7 +105,7 @@ test_expect_success 'not uptodate file porcelain checkout error' '\n '\n \n cat >expect <<\\EOF\n-error: Updating the following directories would lose untracked files in it:\n+error: Updating the following directories would lose untracked files in them:\n \trep\n \trep2\n \ndiff --git a/unpack-trees.c b/unpack-trees.c\nindex ea6bdd20e0..7a6df99d10 100644\n--- a/unpack-trees.c\n+++ b/unpack-trees.c\n@@ -78,7 +78,7 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,\n \t\txstrfmt(msg, cmd, cmd);\n \n \tmsgs[ERROR_NOT_UPTODATE_DIR] =\n-\t\t_(\"Updating the following directories would lose untracked files in it:\\n%s\");\n+\t\t_(\"Updating the following directories would lose untracked files in them:\\n%s\");\n \n \tif (!strcmp(cmd, \"checkout\"))\n \t\tmsg = advice_commit_before_merge\n-- \n2.10.2.613.g22f2156\n\n"},{"id":"306805","messageId":"b2fedf5bad754cd0b6f23e83a415b731@exmbdft7.ad.twosigma.com","threadId":"44593","inReplyTo":"20161202191741.12693-1-sbeller@google.com","subject":"RE: [PATCH] unpack-trees: fix grammar for untracked files in directories","fromName":"David Turner","fromEmail":"david.turner@twosigma.com","sentAt":"2016-12-02T19:23:24Z","receivedAt":"2016-12-02T19:23:30Z","isPatch":true,"sender":{"key":"david.turner@twosigma.com","avatar":null},"body":"LGTM.\n\n> -----Original Message-----\n> From: Stefan Beller [mailto:sbeller@google.com]\n> Sent: Friday, December 02, 2016 2:18 PM\n> To: gitster@pobox.com\n> Cc: git@vger.kernel.org; David Turner; Stefan Beller\n> Subject: [PATCH] unpack-trees: fix grammar for untracked files in\n> directories\n> \n> Noticed-by: David Turner <dturner@twosigma.com>\n> Signed-off-by: Stefan Beller <sbeller@google.com>\n> ---\n> \n> This was noticed by David when reviewing the submodule checkout series,\n> though rolling this as an independent fix is better :)\n> \n> Thanks,\n> Stefan\n> \n>  t/t7609-merge-co-error-msgs.sh | 2 +-\n>  unpack-trees.c                 | 2 +-\n>  2 files changed, 2 insertions(+), 2 deletions(-)\n> \n> diff --git a/t/t7609-merge-co-error-msgs.sh b/t/t7609-merge-co-error-\n> msgs.sh index f80bdb81e1..e90413204e 100755\n> --- a/t/t7609-merge-co-error-msgs.sh\n> +++ b/t/t7609-merge-co-error-msgs.sh\n> @@ -105,7 +105,7 @@ test_expect_success 'not uptodate file porcelain\n> checkout error' '\n>  '\n> \n>  cat >expect <<\\EOF\n> -error: Updating the following directories would lose untracked files in\n> it:\n> +error: Updating the following directories would lose untracked files in\n> them:\n>  \trep\n>  \trep2\n> \n> diff --git a/unpack-trees.c b/unpack-trees.c index ea6bdd20e0..7a6df99d10\n> 100644\n> --- a/unpack-trees.c\n> +++ b/unpack-trees.c\n> @@ -78,7 +78,7 @@ void setup_unpack_trees_porcelain(struct\n> unpack_trees_options *opts,\n>  \t\txstrfmt(msg, cmd, cmd);\n> \n>  \tmsgs[ERROR_NOT_UPTODATE_DIR] =\n> -\t\t_(\"Updating the following directories would lose untracked\n> files in it:\\n%s\");\n> +\t\t_(\"Updating the following directories would lose untracked\n> files in\n> +them:\\n%s\");\n> \n>  \tif (!strcmp(cmd, \"checkout\"))\n>  \t\tmsg = advice_commit_before_merge\n> --\n> 2.10.2.613.g22f2156\n\n"}]}