Marc Branchaud <[email protected]> writes:
> When auto-correct is enabled, an invalid git command prints a warning and
> a continuation message, which differs depending on whether or not
> help.autoCorrect is positive or negative.
>
> With help.autoCorrect = 15:
>
> WARNING: You called a Git command named 'lgo', which does not exist.
> Continuing under the assumption that you meant 'log'
> in 1.5 seconds automatically...
>
> With help.autoCorrect < 0:
>
> WARNING: You called a Git command named 'lgo', which does not exist.
> Continuing under the assumption that you meant 'log'
>
> The continuation message's phrasing is awkward. This commit cleans it up.
> As a bonus, we now use full-sentence strings which make translation easier.
>
> With help.autoCorrect = 15:
>
> WARNING: You called a Git command named 'lgo', which does not exist.
> Continuing in 1.5 seconds, assuming that you meant 'log'.
>
> With help.autoCorrect < 0:
>
> WARNING: You called a Git command named 'lgo', which does not exist.
> Continuing under the assumption that you meant 'log'.
>
> Signed-off-by: Marc Branchaud <[email protected]>
> ---
>
> So here's the patch again.
Thanks. Will queue and wait for people to yell at us when this
breaks their setup (which I highly doubt would happen ;-).
> help.c | 18 ++++++++++++------
> 1 file changed, 12 insertions(+), 6 deletions(-)
>
> diff --git a/help.c b/help.c
> index f637fc800..69966c174 100644
> --- a/help.c
> +++ b/help.c
> @@ -356,12 +356,18 @@ const char *help_unknown_cmd(const char *cmd)
> clean_cmdnames(&main_cmds);
> fprintf_ln(stderr,
> _("WARNING: You called a Git command named '%s', "
> - "which does not exist.\n"
> - "Continuing under the assumption that you meant
> '%s'"),
> - cmd, assumed);
> - if (autocorrect > 0) {
> - fprintf_ln(stderr, _("in %0.1f seconds
> automatically..."),
> - (float)autocorrect/10.0);
> + "which does not exist."),
> + cmd);
> + if (autocorrect < 0)
> + fprintf_ln(stderr,
> + _("Continuing under the assumption that "
> + "you meant '%s'."),
> + assumed);
> + else {
> + fprintf_ln(stderr,
> + _("Continuing in %0.1f seconds, "
> + "assuming that you meant '%s'."),
> + (float)autocorrect/10.0, assumed);
> sleep_millisec(autocorrect * 100);
> }
> return assumed;
