bisect--helper: retire `--bisect-clean-state` subcommand
The `--bisect-clean-state` subcommand is no longer used from the git-bisect.sh shell script. Instead the function `bisect_clean_state()` is directly called from the C implementation. Mentored-by: Lars Schneider <larsxschneider@gmail.com> Mentored-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Pranit Bauva <pranit.bauva@gmail.com> Signed-off-by: Tanushree Tumane <tanushreetumane@gmail.com> Signed-off-by: Miriam Rubio <mirucam@gmail.com> Reviewed-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Pranit Bauva committed
Oct 15, 2020 at 15:38 UTC
e4396072e7b377ed4736e3fbd2b127e6e03da58c
1 file changed
-8
builtin/bisect--helper.c
-8
@@ -22,7 +22,6 @@ static GIT_PATH_FUNC(git_path_bisect_first_parent, "BISECT_FIRST_PARENT")
22
static const char * const git_bisect_helper_usage[] = {
23
N_("git bisect--helper --next-all"),
24
N_("git bisect--helper --write-terms <bad_term> <good_term>"),
25
- N_("git bisect--helper --bisect-clean-state"),
25
N_("git bisect--helper --bisect-reset [<commit>]"),
26
N_("git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> <bad_term>"),
27
N_("git bisect--helper --bisect-check-and-set-terms <command> <good_term> <bad_term>"),
@@ -862,7 +861,6 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
861
enum {
862
NEXT_ALL = 1,
863
WRITE_TERMS,
865
- BISECT_CLEAN_STATE,
864
CHECK_EXPECTED_REVS,
865
BISECT_RESET,
866
BISECT_WRITE,
@@ -880,8 +878,6 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
878
N_("perform 'git bisect next'"), NEXT_ALL),
879
OPT_CMDMODE(0, "write-terms", &cmdmode,
880
N_("write the terms to .git/BISECT_TERMS"), WRITE_TERMS),
883
- OPT_CMDMODE(0, "bisect-clean-state", &cmdmode,
884
- N_("cleanup the bisection state"), BISECT_CLEAN_STATE),
881
OPT_CMDMODE(0, "check-expected-revs", &cmdmode,
882
N_("check for expected revs"), CHECK_EXPECTED_REVS),
883
OPT_CMDMODE(0, "bisect-reset", &cmdmode,
@@ -923,10 +919,6 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
919
if (argc != 2)
920
return error(_("--write-terms requires two arguments"));
921
return write_terms(argv[0], argv[1]);
926
- case BISECT_CLEAN_STATE:
927
- if (argc != 0)
928
- return error(_("--bisect-clean-state requires no arguments"));
929
- return bisect_clean_state();
922
case CHECK_EXPECTED_REVS:
923
check_expected_revs(argv, argc);
924
return 0;