diff options
| -rw-r--r-- | bisect.c | 15 | ||||
| -rw-r--r-- | bisect.h | 1 | ||||
| -rw-r--r-- | builtin-bisect--helper.c | 12 |
3 files changed, 3 insertions, 25 deletions
@@ -554,21 +554,6 @@ static void bisect_common(struct rev_info *revs, const char *prefix, !!skipped_sha1_nr); } -int bisect_next_vars(const char *prefix) -{ - struct rev_info revs; - struct rev_list_info info; - int reaches = 0, all = 0; - - memset(&info, 0, sizeof(info)); - info.revs = &revs; - info.bisect_show_flags = BISECT_SHOW_TRIED | BISECT_SHOW_STRINGED; - - bisect_common(&revs, prefix, &reaches, &all); - - return show_bisect_vars(&info, reaches, all); -} - static void exit_if_skipped_commits(struct commit_list *tried, const unsigned char *bad) { @@ -28,7 +28,6 @@ struct rev_list_info { extern int show_bisect_vars(struct rev_list_info *info, int reaches, int all); -extern int bisect_next_vars(const char *prefix); extern int bisect_next_exit(const char *prefix); extern int estimate_bisect_steps(int all); diff --git a/builtin-bisect--helper.c b/builtin-bisect--helper.c index cb86a9a..aca7018 100644 --- a/builtin-bisect--helper.c +++ b/builtin-bisect--helper.c @@ -4,18 +4,14 @@ #include "bisect.h" static const char * const git_bisect_helper_usage[] = { - "git bisect--helper --next-vars", "git bisect--helper --next-exit", NULL }; int cmd_bisect__helper(int argc, const char **argv, const char *prefix) { - int next_vars = 0; int next_exit = 0; struct option options[] = { - OPT_BOOLEAN(0, "next-vars", &next_vars, - "output next bisect step variables"), OPT_BOOLEAN(0, "next-exit", &next_exit, "output bisect result and exit instuctions"), OPT_END() @@ -23,11 +19,9 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix) argc = parse_options(argc, argv, options, git_bisect_helper_usage, 0); - if ((next_vars && next_exit) || (!next_vars && !next_exit)) + if (!next_exit) usage_with_options(git_bisect_helper_usage, options); - if (next_vars) - return bisect_next_vars(prefix); - else /* next-exit */ - return bisect_next_exit(prefix); + /* next-exit */ + return bisect_next_exit(prefix); } |