bisect--helper: retire `--bisect-write` subcommand

The `--bisect-write` subcommand is no longer used from the
git-bisect.sh shell script. Instead the function `bisect_write()`
is directly called from the C implementation.

Mentored-by: Lars Schneider <larsxschneider@gmail.com>
Mentored-by: Christian Couder <chriscool@tuxfamily.org>
Mentored-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
index 24489f4411be8cf94373f549a55fe76bfa4a4eb4..36b50e3aa8ba6e5187bbda125aa1de846fe999b9 100644 (file)
--- a/builtin/bisect--helper.c
+++ b/builtin/bisect--helper.c
@@ -21,7 +21,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 --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>"),
        N_("git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"),
        N_("git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --term-new]"),
@@ -998,7 +997,6 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
 {
        enum {
                BISECT_RESET = 1,
-               BISECT_WRITE,
                CHECK_AND_SET_TERMS,
                BISECT_NEXT_CHECK,
                BISECT_TERMS,
@@ -1014,8 +1012,6 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
        struct option options[] = {
                OPT_CMDMODE(0, "bisect-reset", &cmdmode,
                         N_("reset the bisection state"), BISECT_RESET),
-               OPT_CMDMODE(0, "bisect-write", &cmdmode,
-                        N_("write out the bisection state in BISECT_LOG"), BISECT_WRITE),
                OPT_CMDMODE(0, "check-and-set-terms", &cmdmode,
                         N_("check and set terms in a bisection state"), CHECK_AND_SET_TERMS),
                OPT_CMDMODE(0, "bisect-next-check", &cmdmode,
@@ -1052,12 +1048,6 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
                if (argc > 1)
                        return error(_("--bisect-reset requires either no argument or a commit"));
                return !!bisect_reset(argc ? argv[0] : NULL);
-       case BISECT_WRITE:
-               if (argc != 4 && argc != 5)
-                       return error(_("--bisect-write requires either 4 or 5 arguments"));
-               set_terms(&terms, argv[3], argv[2]);
-               res = bisect_write(argv[0], argv[1], &terms, nolog);
-               break;
        case CHECK_AND_SET_TERMS:
                if (argc != 3)
                        return error(_("--check-and-set-terms requires 3 arguments"));