Turn `git bisect` into a full built-in
Now that the shell script hands off to the `bisect--helper` to do _anything_ (except to show the help), it is but a tiny step to let the helper implement the actual `git bisect` command instead. This retires `git-bisect.sh`, concluding a multi-year journey that many hands helped with, in particular Pranit Bauna, Tanushree Tumane and Miriam Rubio. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com> Signed-off-by: Taylor Blau <me@ttaylorr.com>
Johannes Schindelin committed
Nov 10, 2022 at 23:36 UTC
73fce29427071e53d2650d7f201cf44d3c941e3b
4 files changed
+4
-5
Makefile
+1
-2
@@ -627,7 +627,6 @@ THIRD_PARTY_SOURCES =
627
# interactive shell sessions without exporting it.
628
unexport CDPATH
629
630
-SCRIPT_SH += git-bisect.sh
630
SCRIPT_SH += git-difftool--helper.sh
631
SCRIPT_SH += git-filter-branch.sh
632
SCRIPT_SH += git-merge-octopus.sh
@@ -1137,7 +1136,7 @@ BUILTIN_OBJS += builtin/am.o
1136
BUILTIN_OBJS += builtin/annotate.o
1137
BUILTIN_OBJS += builtin/apply.o
1138
BUILTIN_OBJS += builtin/archive.o
1140
-BUILTIN_OBJS += builtin/bisect--helper.o
1139
+BUILTIN_OBJS += builtin/bisect.o
1140
BUILTIN_OBJS += builtin/blame.o
1141
BUILTIN_OBJS += builtin/branch.o
1142
BUILTIN_OBJS += builtin/bugreport.o
builtin.h
+1
-1
@@ -116,7 +116,7 @@ int cmd_am(int argc, const char **argv, const char *prefix);
116
int cmd_annotate(int argc, const char **argv, const char *prefix);
117
int cmd_apply(int argc, const char **argv, const char *prefix);
118
int cmd_archive(int argc, const char **argv, const char *prefix);
119
-int cmd_bisect__helper(int argc, const char **argv, const char *prefix);
119
+int cmd_bisect(int argc, const char **argv, const char *prefix);
120
int cmd_blame(int argc, const char **argv, const char *prefix);
121
int cmd_branch(int argc, const char **argv, const char *prefix);
122
int cmd_bugreport(int argc, const char **argv, const char *prefix);
builtin/bisect.c
renamed
+1
-1
@@ -1401,7 +1401,7 @@ static int cmd_bisect__run(int argc, const char **argv, const char *prefix UNUSE
1401
return res;
1402
}
1403
1404
-int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
1404
+int cmd_bisect(int argc, const char **argv, const char *prefix)
1405
{
1406
int res = 0;
1407
parse_opt_subcommand_fn *fn = NULL;
git.c
+1
-1
@@ -492,7 +492,7 @@ static struct cmd_struct commands[] = {
492
{ "annotate", cmd_annotate, RUN_SETUP },
493
{ "apply", cmd_apply, RUN_SETUP_GENTLY },
494
{ "archive", cmd_archive, RUN_SETUP_GENTLY },
495
- { "bisect--helper", cmd_bisect__helper, RUN_SETUP },
495
+ { "bisect", cmd_bisect, RUN_SETUP },
496
{ "blame", cmd_blame, RUN_SETUP },
497
{ "branch", cmd_branch, RUN_SETUP | DELAY_PAGER_CONFIG },
498
{ "bugreport", cmd_bugreport, RUN_SETUP_GENTLY },