From: Pranit Bauva <[email protected]>

The `--write-terms` subcommand is no longer used in the shell script and
the function `write_terms()` is called from the C implementation of
`set_terms()` and `bisect_start()`.

Mentored-by: Lars Schneider <[email protected]>
Mentored-by: Christian Couder <[email protected]>
Mentored-by: Johannes Schindelin <[email protected]>
Signed-off-by: Pranit Bauva <[email protected]>
Signed-off-by: Tanushree Tumane <[email protected]>
---
 builtin/bisect--helper.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
index 9cc11450f4..d6308cabd2 100644
--- a/builtin/bisect--helper.c
+++ b/builtin/bisect--helper.c
@@ -20,7 +20,6 @@ static GIT_PATH_FUNC(git_path_head_name, "head-name")
 static GIT_PATH_FUNC(git_path_bisect_names, "BISECT_NAMES")
 
 static const char * const git_bisect_helper_usage[] = {
-       N_("git bisect--helper --write-terms <bad_term> <good_term>"),
        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>"),
@@ -891,8 +890,7 @@ static int bisect_state(struct bisect_terms *terms, const 
char **argv,
 int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
 {
        enum {
-               WRITE_TERMS = 1,
-               BISECT_RESET,
+               BISECT_RESET = 1,
                BISECT_WRITE,
                CHECK_AND_SET_TERMS,
                BISECT_NEXT_CHECK,
@@ -905,8 +903,6 @@ int cmd_bisect__helper(int argc, const char **argv, const 
char *prefix)
        } cmdmode = 0;
        int no_checkout = 0, res = 0, nolog = 0;
        struct option options[] = {
-               OPT_CMDMODE(0, "write-terms", &cmdmode,
-                        N_("write the terms to .git/BISECT_TERMS"), 
WRITE_TERMS),
                OPT_CMDMODE(0, "bisect-reset", &cmdmode,
                         N_("reset the bisection state"), BISECT_RESET),
                OPT_CMDMODE(0, "bisect-write", &cmdmode,
@@ -943,10 +939,6 @@ int cmd_bisect__helper(int argc, const char **argv, const 
char *prefix)
                usage_with_options(git_bisect_helper_usage, options);
 
        switch (cmdmode) {
-       case WRITE_TERMS:
-               if (argc != 2)
-                       return error(_("--write-terms requires two arguments"));
-               return write_terms(argv[0], argv[1]);
        case BISECT_RESET:
                if (argc > 1)
                        return error(_("--bisect-reset requires either no 
argument or a commit"));
-- 
gitgitgadget

Reply via email to