{"thread":{"id":"42701","subject":"[PATCH] unpack-trees: fix English grammar in do-this-before-that messages","startedAt":"2016-06-24T05:31:44Z","lastAt":"2016-06-24T23:02:58Z","messageCount":5,"participants":["Alex Henrie","Matthieu Moy","Vasco Almeida","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"290010","messageId":"20160624053135.7848-1-alexhenrie24@gmail.com","threadId":"42701","inReplyTo":null,"subject":"[PATCH] unpack-trees: fix English grammar in do-this-before-that messages","fromName":"Alex Henrie","fromEmail":"alexhenrie24@gmail.com","sentAt":"2016-06-24T05:31:35Z","receivedAt":"2016-06-24T05:31:44Z","isPatch":true,"sender":{"key":"alexhenrie24@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5951993?v=4"},"body":"Signed-off-by: Alex Henrie \n---\n unpack-trees.c | 18 +++++++++---------\n 1 file changed, 9 insertions(+), 9 deletions(-)\n\ndiff --git a/unpack-trees.c b/unpack-trees.c\nindex 6bc9512..11c37fb 100644\n--- a/unpack-trees.c\n+++ b/unpack-trees.c\n@@ -62,17 +62,17 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,\n \tif (!strcmp(cmd, \"checkout\"))\n \t\tmsg = advice_commit_before_merge\n \t\t ? _(\"Your local changes to the following files would be overwritten by checkout:\\n%%s\"\n-\t\t\t \"Please commit your changes or stash them before you can switch branches.\")\n+\t\t\t \"Please commit your changes or stash them before you switch branches.\")\n \t\t : _(\"Your local changes to the following files would be overwritten by checkout:\\n%%s\");\n \telse if (!strcmp(cmd, \"merge\"))\n \t\tmsg = advice_commit_before_merge\n \t\t ? _(\"Your local changes to the following files would be overwritten by merge:\\n%%s\"\n-\t\t\t \"Please commit your changes or stash them before you can merge.\")\n+\t\t\t \"Please commit your changes or stash them before you merge.\")\n \t\t : _(\"Your local changes to the following files would be overwritten by merge:\\n%%s\");\n \telse\n \t\tmsg = advice_commit_before_merge\n \t\t ? _(\"Your local changes to the following files would be overwritten by %s:\\n%%s\"\n-\t\t\t \"Please commit your changes or stash them before you can %s.\")\n+\t\t\t \"Please commit your changes or stash them before you %s.\")\n \t\t : _(\"Your local changes to the following files would be overwritten by %s:\\n%%s\");\n \tmsgs[ERROR_WOULD_OVERWRITE] = msgs[ERROR_NOT_UPTODATE_FILE] =\n \t\txstrfmt(msg, cmd, cmd);\n@@ -83,34 +83,34 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,\n \tif (!strcmp(cmd, \"checkout\"))\n \t\tmsg = advice_commit_before_merge\n \t\t ? _(\"The following untracked working tree files would be removed by checkout:\\n%%s\"\n-\t\t\t \"Please move or remove them before you can switch branches.\")\n+\t\t\t \"Please move or remove them before you switch branches.\")\n \t\t : _(\"The following untracked working tree files would be removed by checkout:\\n%%s\");\n \telse if (!strcmp(cmd, \"merge\"))\n \t\tmsg = advice_commit_before_merge\n \t\t ? _(\"The following untracked working tree files would be removed by merge:\\n%%s\"\n-\t\t\t \"Please move or remove them before you can merge.\")\n+\t\t\t \"Please move or remove them before you merge.\")\n \t\t : _(\"The following untracked working tree files would be removed by merge:\\n%%s\");\n \telse\n \t\tmsg = advice_commit_before_merge\n \t\t ? _(\"The following untracked working tree files would be removed by %s:\\n%%s\"\n-\t\t\t \"Please move or remove them before you can %s.\")\n+\t\t\t \"Please move or remove them before you %s.\")\n \t\t : _(\"The following untracked working tree files would be removed by %s:\\n%%s\");\n \tmsgs[ERROR_WOULD_LOSE_UNTRACKED_REMOVED] = xstrfmt(msg, cmd, cmd);\n \n \tif (!strcmp(cmd, \"checkout\"))\n \t\tmsg = advice_commit_before_merge\n \t\t ? _(\"The following untracked working tree files would be overwritten by checkout:\\n%%s\"\n-\t\t\t \"Please move or remove them before you can switch branches.\")\n+\t\t\t \"Please move or remove them before you switch branches.\")\n \t\t : _(\"The following untracked working tree files would be overwritten by checkout:\\n%%s\");\n \telse if (!strcmp(cmd, \"merge\"))\n \t\tmsg = advice_commit_before_merge\n \t\t ? _(\"The following untracked working tree files would be overwritten by merge:\\n%%s\"\n-\t\t\t \"Please move or remove them before you can merge.\")\n+\t\t\t \"Please move or remove them before you merge.\")\n \t\t : _(\"The following untracked working tree files would be overwritten by merge:\\n%%s\");\n \telse\n \t\tmsg = advice_commit_before_merge\n \t\t ? _(\"The following untracked working tree files would be overwritten by %s:\\n%%s\"\n-\t\t\t \"Please move or remove them before you can %s.\")\n+\t\t\t \"Please move or remove them before you %s.\")\n \t\t : _(\"The following untracked working tree files would be overwritten by %s:\\n%%s\");\n \tmsgs[ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN] = xstrfmt(msg, cmd, cmd);\n \n-- \n2.9.0\n\n"},{"id":"290012","messageId":"vpqeg7nj5tk.fsf@anie.imag.fr","threadId":"42701","inReplyTo":"20160624053135.7848-1-alexhenrie24@gmail.com","subject":"Re: [PATCH] unpack-trees: fix English grammar in do-this-before-that messages","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@grenoble-inp.fr","sentAt":"2016-06-24T09:26:31Z","receivedAt":"2016-06-24T09:26:44Z","isPatch":true,"sender":{"key":"matthieu.moy@grenoble-inp.fr","avatar":"https://gravatar.com/avatar/72c8a2705971a25dfaff23cece15130d405685845d911aedd5667ace277f3fc5?d=mp&s=160"},"body":"Alex Henrie writes:\n\n> Signed-off-by: Alex Henrie \n> ---\n> unpack-trees.c | 18 +++++++++---------\n> 1 file changed, 9 insertions(+), 9 deletions(-)\n>\n> diff --git a/unpack-trees.c b/unpack-trees.c\n> index 6bc9512..11c37fb 100644\n> --- a/unpack-trees.c\n> +++ b/unpack-trees.c\n> @@ -62,17 +62,17 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,\n> \tif (!strcmp(cmd, \"checkout\"))\n> \t\tmsg = advice_commit_before_merge\n> \t\t ? _(\"Your local changes to the following files would be overwritten by checkout:\\n%%s\"\n> -\t\t\t \"Please commit your changes or stash them before you can switch branches.\")\n> +\t\t\t \"Please commit your changes or stash them before you switch branches.\")\n\nI'm not a native speaker, but I think both versions are correct.\n\nI'm OK with the change, though. Dropping something useless is usually a\ngood thing :-).\n\n-- \nMatthieu Moy\nhttp://www-verimag.imag.fr/~moy/\n"},{"id":"290015","messageId":"576D1BEA.8020509@sapo.pt","threadId":"42701","inReplyTo":"20160624053135.7848-1-alexhenrie24@gmail.com","subject":"Re: [PATCH] unpack-trees: fix English grammar in do-this-before-that messages","fromName":"Vasco Almeida","fromEmail":"vascomalmeida@sapo.pt","sentAt":"2016-06-24T11:39:22Z","receivedAt":"2016-06-24T11:39:30Z","isPatch":true,"sender":{"key":"vascomalmeida@sapo.pt","avatar":"https://avatars.githubusercontent.com/u/9001556?v=4"},"body":"Às 05:31 de 24-06-2016, Alex Henrie escreveu:\n> Signed-off-by: Alex Henrie \n> ---\n> unpack-trees.c | 18 +++++++++---------\n> 1 file changed, 9 insertions(+), 9 deletions(-)\n> \n> diff --git a/unpack-trees.c b/unpack-trees.c\n> index 6bc9512..11c37fb 100644\n> --- a/unpack-trees.c\n> +++ b/unpack-trees.c\n> @@ -62,17 +62,17 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,\n> \tif (!strcmp(cmd, \"checkout\"))\n> \t\tmsg = advice_commit_before_merge\n> \t\t ? _(\"Your local changes to the following files would be overwritten by checkout:\\n%%s\"\n> -\t\t\t \"Please commit your changes or stash them before you can switch branches.\")\n> +\t\t\t \"Please commit your changes or stash them before you switch branches.\")\n> \t\t : _(\"Your local changes to the following files would be overwritten by checkout:\\n%%s\");\n\nThe only downside I can tell about this is translator are going to have\nto update those strings on their translations, but that is a normal\nthing to do on an active project like Git.\n\nI'm not a native speak either, but I think I have translated that as if\nthe sentences were like this patch introduces. I agree with this change.\n"},{"id":"290072","messageId":"xmqqoa6qdxxk.fsf@gitster.mtv.corp.google.com","threadId":"42701","inReplyTo":"576D1BEA.8020509@sapo.pt","subject":"Re: [PATCH] unpack-trees: fix English grammar in do-this-before-that messages","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2016-06-24T22:28:07Z","receivedAt":"2016-06-24T22:28:17Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Vasco Almeida writes:\n\n> The only downside I can tell about this is translator are going to have\n> to update those strings on their translations, but that is a normal\n> thing to do on an active project like Git.\n\nA larger issue is this fails to update tests that check these\nmessages.\n\n"},{"id":"290075","messageId":"20160625000251.Horde.vVfLKdUIk3yyVI6IH45x6TN@mail.sapo.pt","threadId":"42701","inReplyTo":"xmqqoa6qdxxk.fsf@gitster.mtv.corp.google.com","subject":"Re: [PATCH] unpack-trees: fix English grammar in do-this-before-that messages","fromName":"Vasco Almeida","fromEmail":"vascomalmeida@sapo.pt","sentAt":"2016-06-24T23:02:51Z","receivedAt":"2016-06-24T23:02:58Z","isPatch":true,"sender":{"key":"vascomalmeida@sapo.pt","avatar":"https://avatars.githubusercontent.com/u/9001556?v=4"},"body":"Citando Junio C Hamano :\n\n> Vasco Almeida writes:\n>\n>> The only downside I can tell about this is translator are going to have\n>> to update those strings on their translations, but that is a normal\n>> thing to do on an active project like Git.\n>\n> A larger issue is this fails to update tests that check these\n> messages.\n\nYes, I forget about tests :-). Alex Henrie, or someone else, should \nupdate the tests to reflect this change if it is to go forward.\n\n"}]}