{"thread":{"id":"56555","subject":"[PATCH v2] difftool: fix word spacing in the usage strings","startedAt":"2021-09-21T11:17:47Z","lastAt":"2021-09-23T00:10:22Z","messageCount":2,"participants":["Bagas Sanjaya","Junio C Hamano"],"isPatch":true,"patchVersion":2,"patchTotal":null},"messages":[{"id":"436596","messageId":"20210921111712.894245-1-bagasdotme@gmail.com","threadId":"56555","inReplyTo":null,"subject":"[PATCH v2] difftool: fix word spacing in the usage strings","fromName":"Bagas Sanjaya","fromEmail":"bagasdotme@gmail.com","sentAt":"2021-09-21T11:17:13Z","receivedAt":"2021-09-21T11:17:47Z","isPatch":true,"sender":{"key":"bagasdotme@gmail.com","avatar":"https://avatars.githubusercontent.com/u/40219486?v=4"},"body":"Remove spaces in `non - zero` and add a space between the diff\nformat/mode and option parentheses in difftool's usage strings.\n\nSigned-off-by: Bagas Sanjaya <bagasdotme@gmail.com>\n---\n\nChanges since v1 [1]:\n  - Touch up commit message to imperative tone (suggested by David\n    Aguilar)\n\nRange-diff against v1 [1]:\n1:  d27159f7c9 ! 1:  18d5034c80 difftool: word spacing fix\n    @@ Metadata\n     Author: Bagas Sanjaya <bagasdotme@gmail.com>\n     \n      ## Commit message ##\n    -    difftool: word spacing fix\n    +    difftool: fix word spacing in the usage strings\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    +    Remove spaces in `non - zero` and add a space between the diff\n    +    format/mode and option parentheses in difftool's usage strings.\n     \n         Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com>\n     \n[1]:\nhttps://lore.kernel.org/git/c536bd3a-d1ae-a617-c284-dabc9f8c1c0f@gmail.com/T/#t\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":"436806","messageId":"xmqqk0j840ex.fsf@gitster.g","threadId":"56555","inReplyTo":"20210921111712.894245-1-bagasdotme@gmail.com","subject":"Re: [PATCH v2] difftool: fix word spacing in the usage strings","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2021-09-23T00:10:14Z","receivedAt":"2021-09-23T00:10:22Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Bagas Sanjaya <bagasdotme@gmail.com> writes:\n\n> Remove spaces in `non - zero` and add a space between the diff\n> format/mode and option parentheses in difftool's usage strings.\n>\n> Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com>\n> ---\n>\n> Changes since v1 [1]:\n>   - Touch up commit message to imperative tone (suggested by David\n>     Aguilar)\n>\n> Range-diff against v1 [1]:\n> 1:  d27159f7c9 ! 1:  18d5034c80 difftool: word spacing fix\n>     @@ Metadata\n>      Author: Bagas Sanjaya <bagasdotme@gmail.com>\n>      \n>       ## Commit message ##\n>     -    difftool: word spacing fix\n>     +    difftool: fix word spacing in the usage strings\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>     +    Remove spaces in `non - zero` and add a space between the diff\n>     +    format/mode and option parentheses in difftool's usage strings.\n\nOK.\n\nWill queue; thanks.\n"}]}