[PATCH v14 20/27] bisect--helper: retire `--write-terms` subcommand
- From
Pranit Bauva <pranit.bauva@gmail.com>
- Date
- Aug 23, 2016, 11:53 UTC
- Message-ID
- <01020156b73fe6d2-1815fb4e-50a2-4176-900e-9f22c5bfb9ec-000000@eu-west-1.amazonses.com>
- In-Reply-To
- <01020156b73fe5b4-5dc768ab-b73b-4a21-ab92-018e2a7aa6f7-000000@eu-west-1.amazonses.com>
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 <larsxschneider@gmail.com> Mentored-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Pranit Bauva <pranit.bauva@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 6cc990b..1b6e5d8 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>"), @@ -868,8 +867,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, @@ -882,8 +880,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, @@ -920,11 +916,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