bisect--helper: retire `--write-terms` subcommand
The `--write-terms` subcommand is no longer used from the git-bisect.sh shell script. Instead 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> 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> Reviewed-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Pranit Bauva committed
Oct 15, 2020 at 15:38 UTC
5c517fe345baa6bc7d0ecc31dd60c299dc6648ce
1 file changed
+1
-9
builtin/bisect--helper.c
+1
-9
@@ -20,7 +20,6 @@ static GIT_PATH_FUNC(git_path_bisect_names, "BISECT_NAMES")
20
static GIT_PATH_FUNC(git_path_bisect_first_parent, "BISECT_FIRST_PARENT")
21
22
static const char * const git_bisect_helper_usage[] = {
23
- N_("git bisect--helper --write-terms <bad_term> <good_term>"),
23
N_("git bisect--helper --bisect-reset [<commit>]"),
24
N_("git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> <bad_term>"),
25
N_("git bisect--helper --bisect-check-and-set-terms <command> <good_term> <bad_term>"),
@@ -910,8 +909,7 @@ static enum bisect_error bisect_state(struct bisect_terms *terms, const char **a
909
int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
910
{
911
enum {
913
- WRITE_TERMS = 1,
914
- BISECT_RESET,
912
+ BISECT_RESET = 1,
913
BISECT_WRITE,
914
CHECK_AND_SET_TERMS,
915
BISECT_NEXT_CHECK,
@@ -924,8 +922,6 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
922
} cmdmode = 0;
923
int res = 0, nolog = 0;
924
struct option options[] = {
927
- OPT_CMDMODE(0, "write-terms", &cmdmode,
928
- N_("write the terms to .git/BISECT_TERMS"), WRITE_TERMS),
925
OPT_CMDMODE(0, "bisect-reset", &cmdmode,
926
N_("reset the bisection state"), BISECT_RESET),
927
OPT_CMDMODE(0, "bisect-write", &cmdmode,
@@ -960,10 +956,6 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
956
usage_with_options(git_bisect_helper_usage, options);
957
958
switch (cmdmode) {
963
- case WRITE_TERMS:
964
- if (argc != 2)
965
- return error(_("--write-terms requires two arguments"));
966
- return write_terms(argv[0], argv[1]);
959
case BISECT_RESET:
960
if (argc > 1)
961
return error(_("--bisect-reset requires either no argument or a commit"));