From cade4f1719e74b3e54b4ace6ca809550cf1248f8 Mon Sep 17 00:00:00 2001 From: Chris Howlett Date: Mon, 17 Feb 2025 13:02:50 +0000 Subject: [PATCH] help: add prompt-yes setting for autocorrect The help.autocorrect functionality is really useful, saving frustration when a dev fat-fingers a command, and git has a pretty good idea what was originally intended. The config settings are a nice selection, with "prompt" asking the user to confirm that they want to run the assumed command. However, with "prompt", the choice defaults to "No" - that is, hitting return will _not_ run the command. For me at least, if git is confident it knows which command I wanted, it's usually right, and the golden path would be to run the command. Therefore this patch adds "prompt-yes" as a counterpart config setting for help.autocorrect, which does the same as "prompt", but defaults to "Yes" - hitting return will run the assumed command. I have not added any tests because the test suite doesn't have any tests (that I could find) for the "prompt" behaviour - I'm assuming this is because it's hard/impossible to simulate the interactive terminal prompt Signed-off-by: Chris Howlett --- Documentation/config/help.adoc | 4 +++- help.c | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/Documentation/config/help.adoc b/Documentation/config/help.adoc index b369589cec9474..69b13b119f1290 100644 --- a/Documentation/config/help.adoc +++ b/Documentation/config/help.adoc @@ -18,7 +18,9 @@ immediately. deciseconds (0.1 sec). - "never": don't run or show any suggested command. - "prompt": show the suggestion and prompt for confirmation to run -the command. +the command. The default choice at the prompt is "No" + - "prompt-yes": show the suggestion and prompt for confirmation to run +the command. The default choice at the prompt is "Yes" help.htmlPath:: Specify the path where the HTML documentation resides. File system paths diff --git a/help.c b/help.c index 8d91afe851d1f7..2a25882af028a7 100644 --- a/help.c +++ b/help.c @@ -552,6 +552,7 @@ struct help_unknown_cmd_config { struct cmdnames aliases; }; +#define AUTOCORRECT_PROMPT_YES (-5) #define AUTOCORRECT_SHOW (-4) #define AUTOCORRECT_PROMPT (-3) #define AUTOCORRECT_NEVER (-2) @@ -570,6 +571,8 @@ static int parse_autocorrect(const char *value) if (!strcmp(value, "prompt")) return AUTOCORRECT_PROMPT; + if (!strcmp(value, "prompt-yes")) + return AUTOCORRECT_PROMPT_YES; if (!strcmp(value, "never")) return AUTOCORRECT_NEVER; if (!strcmp(value, "immediate")) @@ -650,6 +653,9 @@ char *help_unknown_cmd(const char *cmd) if ((cfg.autocorrect == AUTOCORRECT_PROMPT) && (!isatty(0) || !isatty(2))) cfg.autocorrect = AUTOCORRECT_NEVER; + if ((cfg.autocorrect == AUTOCORRECT_PROMPT_YES) && (!isatty(0) || !isatty(2))) + cfg.autocorrect = AUTOCORRECT_IMMEDIATELY; + if (cfg.autocorrect == AUTOCORRECT_NEVER) { fprintf_ln(stderr, _("git: '%s' is not a git command. See 'git --help'."), cmd); exit(1); @@ -738,6 +744,15 @@ char *help_unknown_cmd(const char *cmd) if (!(starts_with(answer, "y") || starts_with(answer, "Y"))) exit(1); + } else if (cfg.autocorrect == AUTOCORRECT_PROMPT_YES) { + char *answer; + struct strbuf msg = STRBUF_INIT; + strbuf_addf(&msg, _("Run '%s' instead [Y/n]? "), assumed); + answer = git_prompt(msg.buf, PROMPT_ECHO); + strbuf_release(&msg); + if (starts_with(answer, "n") || + starts_with(answer, "N")) + exit(1); } else { fprintf_ln(stderr, _("Continuing in %0.1f seconds, "