{"thread":{"id":"56546","subject":"[PATCH RESEND] difftool: word spacing fix","startedAt":"2021-09-20T12:19:34Z","lastAt":"2021-09-21T07:41:30Z","messageCount":3,"participants":["Bagas Sanjaya","David Aguilar"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"436410","messageId":"20210920121627.905359-1-bagasdotme@gmail.com","threadId":"56546","inReplyTo":null,"subject":"[PATCH RESEND] difftool: word spacing fix","fromName":"Bagas Sanjaya","fromEmail":"bagasdotme@gmail.com","sentAt":"2021-09-20T12:16:28Z","receivedAt":"2021-09-20T12:19:34Z","isPatch":true,"sender":{"key":"bagasdotme@gmail.com","avatar":"https://avatars.githubusercontent.com/u/40219486?v=4"},"body":"Two grammar fixes related to word spacing:\n\n - delete space in `non - zero`\n - add space between diff formats/mode and option parentheses\n\nCc: Johannes Schindelin \nCc: David Aguilar \nCc: Ævar Arnfjörð Bjarmason \nSigned-off-by: Bagas Sanjaya \n---\n builtin/difftool.c | 6 +++---\n 1 file changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/builtin/difftool.c b/builtin/difftool.c\nindex 6a9242a803..ad9187761e 100644\n--- a/builtin/difftool.c\n+++ b/builtin/difftool.c\n@@ -410,9 +410,9 @@ static int run_dir_diff(const char *extcmd, int symlinks, const char *prefix,\n \t\tconst char *src_path, *dst_path;\n \n \t\tif (starts_with(info.buf, \"::\"))\n-\t\t\tdie(N_(\"combined diff formats('-c' and '--cc') are \"\n+\t\t\tdie(N_(\"combined diff formats ('-c' and '--cc') are \"\n \t\t\t \"not supported in\\n\"\n-\t\t\t \"directory diff mode('-d' and '--dir-diff').\"));\n+\t\t\t \"directory diff mode ('-d' and '--dir-diff').\"));\n \n \t\tif (parse_index_info(info.buf, &lmode, &rmode, &loid, &roid,\n \t\t\t\t &status))\n@@ -713,7 +713,7 @@ int cmd_difftool(int argc, const char **argv, const char *prefix)\n \t\t\t \"`--tool`\")),\n \t\tOPT_BOOL(0, \"trust-exit-code\", &trust_exit_code,\n \t\t\t N_(\"make 'git-difftool' exit when an invoked diff \"\n-\t\t\t \"tool returns a non - zero exit code\")),\n+\t\t\t \"tool returns a non-zero exit code\")),\n \t\tOPT_STRING('x', \"extcmd\", &extcmd, N_(\"command\"),\n \t\t\t N_(\"specify a custom command for viewing diffs\")),\n \t\tOPT_ARGUMENT(\"no-index\", &no_index, N_(\"passed to `diff`\")),\n\nbase-commit: 4c719308ce59dc70e606f910f40801f2c6051b24\n-- \n2.25.1\n\n"},{"id":"436495","messageId":"CAJDDKr4LfTC8h00NCLSu5J=oBTX3LWshrOXMQ7_iBi4RNie9sA@mail.gmail.com","threadId":"56546","inReplyTo":"20210920121627.905359-1-bagasdotme@gmail.com","subject":"Re: [PATCH RESEND] difftool: word spacing fix","fromName":"David Aguilar","fromEmail":"davvid@gmail.com","sentAt":"2021-09-20T21:26:35Z","receivedAt":"2021-09-21T02:20:02Z","isPatch":true,"sender":{"key":"davvid@gmail.com","avatar":"https://avatars.githubusercontent.com/u/13196?v=4"},"body":"On Mon, Sep 20, 2021 at 5:19 AM Bagas Sanjaya wrote:\n>\n> Two grammar fixes related to word spacing:\n>\n> - delete space in `non - zero`\n> - add space between diff formats/mode and option parentheses\n\nThe changes look like a good start, thanks.\n\nCommit messages are written in an imperative tone, so this commit\nmessage could be touched up.\n\nMaybe?\n---\ndifftool: fix word spacing in the usage strings\n\nRemove spaces in `non - zero` and add a space between the diff\nformat/mode and option parentheses in difftool's usage strings.\n---\n\nBut!.. and this is a big but... the po/ translations would be broken\nby this change.\n\nI'm unfamiliar with the policy about changes that affect translations,\nbut in general this seems like a situation where we can make things\neasier for the translation team by not leaving behind further work.\n\nMy gut feeling is that this patch would be easier to accept if it also\nupdated the po/ translations to fix these typofixes.\n\nQuestion for this list -- would that be a separate patch or not? To me\nit seems like it'd all be one patch so that git is never in an\nin-between state.\n\nThe following commands show a few places of interest that should also\nbe updated.\n\n$ git grep 'combined diff formats('\n$ git grep 'tool returns a non - zero'\n\n\n>\n> Cc: Johannes Schindelin \n> Cc: David Aguilar \n> Cc: Ævar Arnfjörð Bjarmason \n> Signed-off-by: Bagas Sanjaya \n> ---\n> builtin/difftool.c | 6 +++---\n> 1 file changed, 3 insertions(+), 3 deletions(-)\n>\n> diff --git a/builtin/difftool.c b/builtin/difftool.c\n> index 6a9242a803..ad9187761e 100644\n> --- a/builtin/difftool.c\n> +++ b/builtin/difftool.c\n> @@ -410,9 +410,9 @@ static int run_dir_diff(const char *extcmd, int symlinks, const char *prefix,\n> const char *src_path, *dst_path;\n>\n> if (starts_with(info.buf, \"::\"))\n> - die(N_(\"combined diff formats('-c' and '--cc') are \"\n> + die(N_(\"combined diff formats ('-c' and '--cc') are \"\n> \"not supported in\\n\"\n> - \"directory diff mode('-d' and '--dir-diff').\"));\n> + \"directory diff mode ('-d' and '--dir-diff').\"));\n>\n> if (parse_index_info(info.buf, &lmode, &rmode, &loid, &roid,\n> &status))\n> @@ -713,7 +713,7 @@ int cmd_difftool(int argc, const char **argv, const char *prefix)\n> \"`--tool`\")),\n> OPT_BOOL(0, \"trust-exit-code\", &trust_exit_code,\n> N_(\"make 'git-difftool' exit when an invoked diff \"\n> - \"tool returns a non - zero exit code\")),\n> + \"tool returns a non-zero exit code\")),\n> OPT_STRING('x', \"extcmd\", &extcmd, N_(\"command\"),\n> N_(\"specify a custom command for viewing diffs\")),\n> OPT_ARGUMENT(\"no-index\", &no_index, N_(\"passed to `diff`\")),\n>\n> base-commit: 4c719308ce59dc70e606f910f40801f2c6051b24\n> --\n> 2.25.1\n>\n\n\n--\nDavid\n"},{"id":"436579","messageId":"c536bd3a-d1ae-a617-c284-dabc9f8c1c0f@gmail.com","threadId":"56546","inReplyTo":"CAJDDKr4LfTC8h00NCLSu5J=oBTX3LWshrOXMQ7_iBi4RNie9sA@mail.gmail.com","subject":"Re: [PATCH RESEND] difftool: word spacing fix","fromName":"Bagas Sanjaya","fromEmail":"bagasdotme@gmail.com","sentAt":"2021-09-21T07:41:23Z","receivedAt":"2021-09-21T07:41:30Z","isPatch":true,"sender":{"key":"bagasdotme@gmail.com","avatar":"https://avatars.githubusercontent.com/u/40219486?v=4"},"body":"On 21/09/21 04.26, David Aguilar wrote:\n> But!.. and this is a big but... the po/ translations would be broken\n> by this change.\n> \n> I'm unfamiliar with the policy about changes that affect translations,\n> but in general this seems like a situation where we can make things\n> easier for the translation team by not leaving behind further work.\n> \n> My gut feeling is that this patch would be easier to accept if it also\n> updated the po/ translations to fix these typofixes.\n> \n> Question for this list -- would that be a separate patch or not? To me\n> it seems like it'd all be one patch so that git is never in an\n> in-between state.\n> \n\nI think you should see po/README for details.\n\nIn other words: we can change translatable strings here as we want, and \nit's the responsibility of l10n teams to update translations to stay up \nto date.\n\n> The following commands show a few places of interest that should also\n> be updated.\n> \n> $ git grep 'combined diff formats('\n> $ git grep 'tool returns a non - zero'\n\nI git-grep-ed that, and nothing outside po/ matched.\n\n-- \nAn old man doll... just what I always wanted! - Clara\n"}]}