diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-02-12 10:08:55 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-02-12 10:08:55 -0800 |
| commit | 2d7a874493df07d76d7f1294e72b807ff936cd55 (patch) | |
| tree | 7d32346b7484f8184806ffc025dad9200bdc0ad3 /help.c | |
| parent | Merge branch 'sc/help-autocorrect-one' (diff) | |
| parent | help: add "show" as a valid configuration value (diff) | |
| download | git-2d7a874493df07d76d7f1294e72b807ff936cd55.tar.gz git-2d7a874493df07d76d7f1294e72b807ff936cd55.zip | |
Merge branch 'da/help-autocorrect-one-fix'
"git -c help.autocorrect=0 psuh" shows the suggested typofix,
unlike the previous attempt in the base topic.
* da/help-autocorrect-one-fix:
help: add "show" as a valid configuration value
help: show the suggested command when help.autocorrect is false
Diffstat (limited to 'help.c')
| -rw-r--r-- | help.c | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -552,6 +552,7 @@ struct help_unknown_cmd_config { struct cmdnames aliases; }; +#define AUTOCORRECT_SHOW (-4) #define AUTOCORRECT_PROMPT (-3) #define AUTOCORRECT_NEVER (-2) #define AUTOCORRECT_IMMEDIATELY (-1) @@ -562,7 +563,7 @@ static int parse_autocorrect(const char *value) case 1: return AUTOCORRECT_IMMEDIATELY; case 0: - return AUTOCORRECT_NEVER; + return AUTOCORRECT_SHOW; default: /* other random text */ break; } @@ -573,6 +574,8 @@ static int parse_autocorrect(const char *value) return AUTOCORRECT_NEVER; if (!strcmp(value, "immediate")) return AUTOCORRECT_IMMEDIATELY; + if (!strcmp(value, "show")) + return AUTOCORRECT_SHOW; return 0; } @@ -713,7 +716,8 @@ char *help_unknown_cmd(const char *cmd) n++) ; /* still counting */ } - if (cfg.autocorrect && n == 1 && SIMILAR_ENOUGH(best_similarity)) { + if (cfg.autocorrect && cfg.autocorrect != AUTOCORRECT_SHOW && n == 1 && + SIMILAR_ENOUGH(best_similarity)) { char *assumed = xstrdup(main_cmds.names[0]->name); fprintf_ln(stderr, |