From: Christian Couder <chriscool@tuxfamily.org>
Date: Tue, 21 Apr 2009 05:54:09 +0000 (+0200)
Subject: bisect--helper: remove "--next-vars" option as it is now useless
X-Git-Tag: v1.6.4-rc0~24^2~24
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c99f069;p=git.git

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 5902e83fa..4796aa919 100644
--- a/bisect.c
+++ b/bisect.c
@@ -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)
 {
diff --git a/bisect.h b/bisect.h
index 028eb8522..908e362f8 100644
--- 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 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 cb86a9a9e..aca7018d8 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);
 }