[PATCH RESEND] difftool: word spacing fix

[PATCH RESEND] difftool: word spacing fix

[Bagas Sanjaya]

Two grammar fixes related to word spacing:

  - delete space in `non - zero`
  - add space between diff formats/mode and option parentheses

Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: David Aguilar <davvid@gmail.com>
Cc: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com>
---
 builtin/difftool.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/builtin/difftool.c b/builtin/difftool.c
index 6a9242a803..ad9187761e 100644
--- a/builtin/difftool.c
+++ b/builtin/difftool.c
@@ -410,9 +410,9 @@ static int run_dir_diff(const char *extcmd, int symlinks, const char *prefix,
 		const char *src_path, *dst_path;
 
 		if (starts_with(info.buf, "::"))
-			die(N_("combined diff formats('-c' and '--cc') are "
+			die(N_("combined diff formats ('-c' and '--cc') are "
 			       "not supported in\n"
-			       "directory diff mode('-d' and '--dir-diff')."));
+			       "directory diff mode ('-d' and '--dir-diff')."));
 
 		if (parse_index_info(info.buf, &lmode, &rmode, &loid, &roid,
 				     &status))
@@ -713,7 +713,7 @@ int cmd_difftool(int argc, const char **argv, const char *prefix)
 			    "`--tool`")),
 		OPT_BOOL(0, "trust-exit-code", &trust_exit_code,
 			 N_("make 'git-difftool' exit when an invoked diff "
-			    "tool returns a non - zero exit code")),
+			    "tool returns a non-zero exit code")),
 		OPT_STRING('x', "extcmd", &extcmd, N_("command"),
 			   N_("specify a custom command for viewing diffs")),
 		OPT_ARGUMENT("no-index", &no_index, N_("passed to `diff`")),

base-commit: 4c719308ce59dc70e606f910f40801f2c6051b24
-- 
2.25.1

Re: [PATCH RESEND] difftool: word spacing fix

[David Aguilar]

On Mon, Sep 20, 2021 at 5:19 AM Bagas Sanjaya <bagasdotme@gmail.com> wrote:
>
> Two grammar fixes related to word spacing:
>
>   - delete space in `non - zero`
>   - add space between diff formats/mode and option parentheses

The changes look like a good start, thanks.

Commit messages are written in an imperative tone, so this commit
message could be touched up.

Maybe?
---
difftool: fix word spacing in the usage strings

Remove spaces in `non - zero` and add a space between the diff
format/mode and option parentheses in difftool's usage strings.
---

But!.. and this is a big but... the po/ translations would be broken
by this change.

I'm unfamiliar with the policy about changes that affect translations,
but in general this seems like a situation where we can make things
easier for the translation team by not leaving behind further work.

My gut feeling is that this patch would be easier to accept if it also
updated the po/ translations to fix these typofixes.

Question for this list -- would that be a separate patch or not? To me
it seems like it'd all be one patch so that git is never in an
in-between state.

The following commands show a few places of interest that should also
be updated.

$ git grep 'combined diff formats('
$ git grep 'tool returns a non - zero'


>
> Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>
> Cc: David Aguilar <davvid@gmail.com>
> Cc: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
> Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com>
> ---
>  builtin/difftool.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/builtin/difftool.c b/builtin/difftool.c
> index 6a9242a803..ad9187761e 100644
> --- a/builtin/difftool.c
> +++ b/builtin/difftool.c
> @@ -410,9 +410,9 @@ static int run_dir_diff(const char *extcmd, int symlinks, const char *prefix,
>                 const char *src_path, *dst_path;
>
>                 if (starts_with(info.buf, "::"))
> -                       die(N_("combined diff formats('-c' and '--cc') are "
> +                       die(N_("combined diff formats ('-c' and '--cc') are "
>                                "not supported in\n"
> -                              "directory diff mode('-d' and '--dir-diff')."));
> +                              "directory diff mode ('-d' and '--dir-diff')."));
>
>                 if (parse_index_info(info.buf, &lmode, &rmode, &loid, &roid,
>                                      &status))
> @@ -713,7 +713,7 @@ int cmd_difftool(int argc, const char **argv, const char *prefix)
>                             "`--tool`")),
>                 OPT_BOOL(0, "trust-exit-code", &trust_exit_code,
>                          N_("make 'git-difftool' exit when an invoked diff "
> -                           "tool returns a non - zero exit code")),
> +                           "tool returns a non-zero exit code")),
>                 OPT_STRING('x', "extcmd", &extcmd, N_("command"),
>                            N_("specify a custom command for viewing diffs")),
>                 OPT_ARGUMENT("no-index", &no_index, N_("passed to `diff`")),
>
> base-commit: 4c719308ce59dc70e606f910f40801f2c6051b24
> --
> 2.25.1
>


--
David

Re: [PATCH RESEND] difftool: word spacing fix

[Bagas Sanjaya]

On 21/09/21 04.26, David Aguilar wrote:
> But!.. and this is a big but... the po/ translations would be broken
> by this change.
> 
> I'm unfamiliar with the policy about changes that affect translations,
> but in general this seems like a situation where we can make things
> easier for the translation team by not leaving behind further work.
> 
> My gut feeling is that this patch would be easier to accept if it also
> updated the po/ translations to fix these typofixes.
> 
> Question for this list -- would that be a separate patch or not? To me
> it seems like it'd all be one patch so that git is never in an
> in-between state.
> 

I think you should see po/README for details.

In other words: we can change translatable strings here as we want, and 
it's the responsibility of l10n teams to update translations to stay up 
to date.

> The following commands show a few places of interest that should also
> be updated.
> 
> $ git grep 'combined diff formats('
> $ git grep 'tool returns a non - zero'

I git-grep-ed that, and nothing outside po/ matched.

-- 
An old man doll... just what I always wanted! - Clara