зеркало из https://github.com/microsoft/git.git
bisect--helper: retire `--next-all` subcommand
The `--next-all` subcommand is no longer used from the git-bisect.sh shell script. Instead the function `bisect_next_all()` is called from the C implementation of `bisect_next()`. Mentored-by: Lars Schneider <larsxschneider@gmail.com> Mentored-by: Christian Couder <chriscool@tuxfamily.org> 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>
This commit is contained in:
Родитель
e4396072e7
Коммит
04774b4e70
|
@ -20,7 +20,6 @@ static GIT_PATH_FUNC(git_path_bisect_names, "BISECT_NAMES")
|
|||
static GIT_PATH_FUNC(git_path_bisect_first_parent, "BISECT_FIRST_PARENT")
|
||||
|
||||
static const char * const git_bisect_helper_usage[] = {
|
||||
N_("git bisect--helper --next-all"),
|
||||
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>"),
|
||||
|
@ -859,8 +858,7 @@ static int bisect_autostart(struct bisect_terms *terms)
|
|||
int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
|
||||
{
|
||||
enum {
|
||||
NEXT_ALL = 1,
|
||||
WRITE_TERMS,
|
||||
WRITE_TERMS = 1,
|
||||
CHECK_EXPECTED_REVS,
|
||||
BISECT_RESET,
|
||||
BISECT_WRITE,
|
||||
|
@ -874,8 +872,6 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
|
|||
} cmdmode = 0;
|
||||
int res = 0, nolog = 0;
|
||||
struct option options[] = {
|
||||
OPT_CMDMODE(0, "next-all", &cmdmode,
|
||||
N_("perform 'git bisect next'"), NEXT_ALL),
|
||||
OPT_CMDMODE(0, "write-terms", &cmdmode,
|
||||
N_("write the terms to .git/BISECT_TERMS"), WRITE_TERMS),
|
||||
OPT_CMDMODE(0, "check-expected-revs", &cmdmode,
|
||||
|
@ -912,9 +908,6 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
|
|||
usage_with_options(git_bisect_helper_usage, options);
|
||||
|
||||
switch (cmdmode) {
|
||||
case NEXT_ALL:
|
||||
res = bisect_next_all(the_repository, prefix);
|
||||
break;
|
||||
case WRITE_TERMS:
|
||||
if (argc != 2)
|
||||
return error(_("--write-terms requires two arguments"));
|
||||
|
|
Загрузка…
Ссылка в новой задаче