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>

diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
index 0196ee144cadcb2b3b4cb612d73f954f92e92207..1b9ee7d963adc6d76cabc3c9cea30e9a23b1f692 100644 (file)
--- a/builtin/bisect--helper.c
+++ b/builtin/bisect--helper.c
@@ -22,7 +22,6 @@ static GIT_PATH_FUNC(git_path_bisect_first_parent, "BISECT_FIRST_PARENT")
 static const char * const git_bisect_helper_usage[] = {
        N_("git bisect--helper --next-all"),
        N_("git bisect--helper --write-terms <bad_term> <good_term>"),
-       N_("git bisect--helper --bisect-clean-state"),
        N_("git bisect--helper --bisect-reset [<commit>]"),
        N_("git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> <bad_term>"),
        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)
        enum {
                NEXT_ALL = 1,
                WRITE_TERMS,
-               BISECT_CLEAN_STATE,
                CHECK_EXPECTED_REVS,
                BISECT_RESET,
                BISECT_WRITE,
@@ -880,8 +878,6 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
                         N_("perform 'git bisect next'"), NEXT_ALL),
                OPT_CMDMODE(0, "write-terms", &cmdmode,
                         N_("write the terms to .git/BISECT_TERMS"), WRITE_TERMS),
-               OPT_CMDMODE(0, "bisect-clean-state", &cmdmode,
-                        N_("cleanup the bisection state"), BISECT_CLEAN_STATE),
                OPT_CMDMODE(0, "check-expected-revs", &cmdmode,
                         N_("check for expected revs"), CHECK_EXPECTED_REVS),
                OPT_CMDMODE(0, "bisect-reset", &cmdmode,
@@ -923,10 +919,6 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
                if (argc != 2)
                        return error(_("--write-terms requires two arguments"));
                return write_terms(argv[0], argv[1]);
-       case BISECT_CLEAN_STATE:
-               if (argc != 0)
-                       return error(_("--bisect-clean-state requires no arguments"));
-               return bisect_clean_state();
        case CHECK_EXPECTED_REVS:
                check_expected_revs(argv, argc);
                return 0;