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 <larsxschnei...@gmail.com>
Mentored-by: Christian Couder <chrisc...@tuxfamily.org>
Signed-off-by: Pranit Bauva <pranit.ba...@gmail.com>
---
 builtin/bisect--helper.c | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
index d5fe35b..493034c 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 <state> <revision> <TERM_GOOD> 
<TERM_BAD> [<nolog>]"),
        N_("git bisect--helper --bisect-check-and-set-terms <command> 
<TERM_GOOD> <TERM_BAD>"),
@@ -862,8 +861,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,
@@ -876,8 +874,6 @@ int cmd_bisect__helper(int argc, const char **argv, const 
char *prefix)
        } cmdmode = 0;
        int no_checkout = 0, res = 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,
@@ -913,11 +909,6 @@ int cmd_bisect__helper(int argc, const char **argv, const 
char *prefix)
 
        switch (cmdmode) {
        int nolog;
-       case WRITE_TERMS:
-               if (argc != 2)
-                       die(_("--write-terms requires two arguments"));
-               res = write_terms(argv[0], argv[1]);
-               break;
        case BISECT_RESET:
                if (argc > 1)
                        die(_("--bisect-reset requires either zero or one 
arguments"));

--
https://github.com/git/git/pull/287

Reply via email to