From: David Aguilar <davvid@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
Scott Chacon <schacon@gmail.com>,
Kristoffer Haugsbakk <kristofferhaugsbakk@fastmail.com>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Yongmin <yewon@revi.email>, Jeff King <peff@peff.net>
Subject: [PATCH 2/2] help: add "show" as a valid configuration value
Date: Sat, 1 Feb 2025 13:33:19 -0800 [thread overview]
Message-ID: <20250201213319.153109-2-davvid@gmail.com> (raw)
In-Reply-To: <20250201213319.153109-1-davvid@gmail.com>
Add a literal value for showing the suggested autocorrection
for consistency with the rest of the help.autocorrect options.
Signed-off-by: David Aguilar <davvid@gmail.com>
---
This is just for consistency with the other config values and
can be dropped if it's not useful.
Documentation/config/help.txt | 2 +-
help.c | 2 ++
t/t9003-help-autocorrect.sh | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/Documentation/config/help.txt b/Documentation/config/help.txt
index 676ba3a55f..b369589cec 100644
--- a/Documentation/config/help.txt
+++ b/Documentation/config/help.txt
@@ -11,7 +11,7 @@ help.autoCorrect::
If git detects typos and can identify exactly one valid command similar
to the error, git will try to suggest the correct command or even
run the suggestion automatically. Possible config values are:
- - 0, "false", "off", "no": show the suggested command (default).
+ - 0, "false", "off", "no", "show": show the suggested command (default).
- 1, "true", "on", "yes", "immediate": run the suggested command
immediately.
- positive number > 1: run the suggested command after specified
diff --git a/help.c b/help.c
index 55425c0d97..8d91afe851 100644
--- a/help.c
+++ b/help.c
@@ -574,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;
}
diff --git a/t/t9003-help-autocorrect.sh b/t/t9003-help-autocorrect.sh
index 5ebfc00f52..8da318d2b5 100755
--- a/t/t9003-help-autocorrect.sh
+++ b/t/t9003-help-autocorrect.sh
@@ -28,7 +28,7 @@ test_expect_success 'setup' '
test_cmp expect actual
'
-for show in false no off 0
+for show in false no off 0 show
do
test_expect_success 'autocorrect showing candidates' '
git config help.autocorrect $show &&
--
2.48.0.rc2.34.gefa3f50b25
next prev parent reply other threads:[~2025-02-01 21:33 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-08 19:31 [PATCH] help: interpret help.autocorrect=1 as "immediate" rather than 0.1s Scott Chacon via GitGitGadget
2025-01-08 21:42 ` Kristoffer Haugsbakk
2025-01-09 0:18 ` Johannes Schindelin
2025-01-13 23:33 ` Taylor Blau
2025-01-09 1:12 ` Junio C Hamano
2025-01-09 7:05 ` Yongmin
2025-01-09 10:49 ` [PATCH v2] help: interpret boolean string values for help.autocorrect Scott Chacon via GitGitGadget
2025-01-09 16:32 ` Junio C Hamano
2025-01-10 7:43 ` Scott Chacon
2025-01-10 9:30 ` Scott Chacon
2025-01-10 12:11 ` Jeff King
2025-01-10 15:02 ` Junio C Hamano
2025-01-11 11:27 ` [PATCH v3] " Scott Chacon via GitGitGadget
2025-01-13 5:43 ` Jeff King
2025-01-13 9:31 ` Scott Chacon
2025-01-13 16:18 ` Junio C Hamano
2025-01-18 1:12 ` Junio C Hamano
2025-01-13 9:33 ` [PATCH v4] " Scott Chacon via GitGitGadget
2025-02-01 21:33 ` [PATCH 1/2] help: show the suggested command when help.autocorrect is false David Aguilar
2025-02-01 21:33 ` David Aguilar [this message]
2025-02-03 22:53 ` [PATCH 2/2] help: add "show" as a valid configuration value Junio C Hamano
2025-02-03 22:53 ` [PATCH 1/2] help: show the suggested command when help.autocorrect is false Junio C Hamano
2025-02-04 3:05 ` Jeff King
2025-02-04 13:38 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250201213319.153109-2-davvid@gmail.com \
--to=davvid@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=kristofferhaugsbakk@fastmail.com \
--cc=peff@peff.net \
--cc=schacon@gmail.com \
--cc=yewon@revi.email \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).