Re: [PATCH] Fix typos in translatable strings for v2.21.0

[Jiang Xin <worldhello.net@gmail.com>]

Jean-Noël Avila <jn.avila@free.fr> 于2019年2月11日周一 下午2:48写道：
>
> Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
> ---
>  builtin/bisect--helper.c | 4 ++--
>  builtin/fetch.c          | 2 +-
>  builtin/rebase.c         | 2 +-
>  3 files changed, 4 insertions(+), 4 deletions(-)

This re-roll is v2 (forgot suffix v2 in subject), and LGTM.
Difference between v1 and v2:

     -              die(_("--reschedule-failed-exec requires an
interactive rebase"));
    -+              die(_("%s requires an interactive rebase",
"--reschedule-failed-exec"));
    ++              die(_("%s requires an interactive rebase"),
"--reschedule-failed-exec");

>
> diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
> index c1cff32661..e7325fe37f 100644
> --- a/builtin/bisect--helper.c
> +++ b/builtin/bisect--helper.c
> @@ -173,7 +173,7 @@ static int bisect_reset(const char *commit)
>                         argv_array_clear(&argv);
>                         return error(_("could not check out original"
>                                        " HEAD '%s'. Try 'git bisect"
> -                                      "reset <commit>'."), branch.buf);
> +                                      " reset <commit>'."), branch.buf);

fixed typo: git bisectreset -> git bisect reset

>                 }
>                 argv_array_clear(&argv);
>         }
> @@ -646,7 +646,7 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
>                 OPT_BOOL(0, "no-checkout", &no_checkout,
>                          N_("update BISECT_HEAD instead of checking out the current commit")),
>                 OPT_BOOL(0, "no-log", &nolog,
> -                        N_("no log for BISECT_WRITE ")),
> +                        N_("no log for BISECT_WRITE")),

strip trailing writespace.

>                 OPT_END()
>         };
>         struct bisect_terms terms = { .term_good = NULL, .term_bad = NULL };
> diff --git a/builtin/fetch.c b/builtin/fetch.c
> index 5a09fe24cd..b620fd54b4 100644
> --- a/builtin/fetch.c
> +++ b/builtin/fetch.c
> @@ -1480,7 +1480,7 @@ static inline void fetch_one_setup_partial(struct remote *remote)
>         if (strcmp(remote->name, repository_format_partial_clone)) {
>                 if (filter_options.choice)
>                         die(_("--filter can only be used with the remote "
> -                             "configured in extensions.partialclone"));
> +                             "configured in extensions.partialClone"));

Use camelcase for config variable name.

>                 return;
>         }
>
> diff --git a/builtin/rebase.c b/builtin/rebase.c
> index 96efd40901..7c7bc13e91 100644
> --- a/builtin/rebase.c
> +++ b/builtin/rebase.c
> @@ -1434,7 +1434,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
>         }
>
>         if (options.reschedule_failed_exec && !is_interactive(&options))
> -               die(_("--reschedule-failed-exec requires an interactive rebase"));
> +               die(_("%s requires an interactive rebase"), "--reschedule-failed-exec");

Reuse l10n string ("%s requires an interactive rebase") defined in
builtin/rebase.c:121:

        case REBASE_AM:
                die(_("%s requires an interactive rebase"), option);

>
>         if (options.git_am_opts.argc) {
>                 /* all am options except -q are compatible only with --am */
> --
> 2.21.0.rc0
>