bisect--helper: remove "--next-vars" option as it is now useless

Because it has been replaced by "--next-exit".

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/bisect.c b/bisect.c
index 5902e83fac76cb419d62cfbbae09048872ba526e..4796aa919870d49f67ad23dded2ce5b654841c87 100644 (file)
--- a/bisect.c
+++ b/bisect.c
@@ -554,21 +554,6 @@ static void bisect_common(struct rev_info *revs, const char *prefix,
                                       !!skipped_sha1_nr);
 }
 
                                       !!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)
 {
 static void exit_if_skipped_commits(struct commit_list *tried,
                                    const unsigned char *bad)
 {

diff --git a/bisect.h b/bisect.h
index 028eb85220bbb2432755ed481818b71e0c29b05d..908e362f8b88c6f9da471042242ade099266a4ac 100644 (file)
--- a/bisect.h
+++ b/bisect.h
@@ -28,7 +28,6 @@ struct rev_list_info {
 
 extern int show_bisect_vars(struct rev_list_info *info, int reaches, int all);
 
 
 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);
 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 cb86a9a9e0cacbc64e1af8866b62d8f29dbc1776..aca7018d834a27c60326d84fa26da5bb1f9ab797 100644 (file)
--- 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[] = {
 #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)
 {
        "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[] = {
        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()
                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);
 
 
        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);
 
                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);

 }
 }