aboutsummaryrefslogtreecommitdiff
path: root/builtin-bisect--helper.c
diff options
context:
space:
mode:
authorChristian Couder <chriscool@tuxfamily.org>2009-04-21 07:54:09 +0200
committerJunio C Hamano <gitster@pobox.com>2009-05-10 00:30:28 -0700
commitc99f069de2f06b7abe0406c2ff1b46621dbc9398 (patch)
tree427f134a9a98fab72f8c38ff75a514523c696a67 /builtin-bisect--helper.c
parent5a1d31c7e43a54c3a5275266745488de7208d871 (diff)
downloadgit-c99f069de2f06b7abe0406c2ff1b46621dbc9398.tar.gz
git-c99f069de2f06b7abe0406c2ff1b46621dbc9398.tar.xz
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>
Diffstat (limited to 'builtin-bisect--helper.c')
-rw-r--r--builtin-bisect--helper.c12
1 files changed, 3 insertions, 9 deletions
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);
}