Skip to content

Commit 2bb3a01

Browse files
ZhongRuoyugitster
authored andcommitted
bisect: fix handling of help and invalid subcommands
As documented in git-bisect(1), `git bisect help` should display usage information. However, since the migration of `git bisect` to a full builtin command in 73fce29 (Turn `git bisect` into a full built-in, 2022-11-10), this behavior was broken. Running `git bisect help` would, instead of showing usage, either fail silently if already in a bisect session, or otherwise trigger an interactive autostart prompt asking "Do you want me to do it for you [Y/n]?". Similarly, since df63421 (bisect--helper: handle states directly, 2022-11-10), running invalid subcommands like `git bisect foobar` also led to the same behavior. This occurred because `help` and other unrecognized subcommands were being unconditionally passed to `bisect_state`, which then called `bisect_autostart`, triggering the interactive prompt. Fix this by: 1. Adding explicit handling for the `help` subcommand to show usage; 2. Validating that unrecognized commands are actually valid state commands before calling `bisect_state`; 3. Showing an error with usage for truly invalid commands. This ensures that `git bisect help` displays the usage as documented, and invalid commands fail cleanly without entering interactive mode. Alternate terms are still handled correctly through `check_and_set_terms`. Signed-off-by: Ruoyu Zhong <zhongruoyu@outlook.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 16bd9f2 commit 2bb3a01

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

builtin/bisect.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1453,9 +1453,13 @@ int cmd_bisect(int argc,
14531453
if (!argc)
14541454
usage_msg_opt(_("need a command"), git_bisect_usage, options);
14551455

1456+
if (!strcmp(argv[0], "help"))
1457+
usage_with_options(git_bisect_usage, options);
1458+
14561459
set_terms(&terms, "bad", "good");
14571460
get_terms(&terms);
1458-
if (check_and_set_terms(&terms, argv[0]))
1461+
if (check_and_set_terms(&terms, argv[0]) ||
1462+
!one_of(argv[0], terms.term_good, terms.term_bad, NULL))
14591463
usage_msg_optf(_("unknown command: '%s'"), git_bisect_usage,
14601464
options, argv[0]);
14611465
res = bisect_state(&terms, argc, argv);

0 commit comments

Comments
 (0)