mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bisect--helper: use OPT_CMDMODE instead of OPT_BOOL

Browse Source 
`--next-all` is meant to be used as a subcommand to support multiple
"operation mode" though the current implementation does not contain any
other subcommand along side with `--next-all` but further commits will
include some more subcommands.

Helped-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
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: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Pranit Bauva
2017-09-29 06:49:39 +00:00
committed by Junio C Hamano
parent 217f2767cb
commit 9e1c84dfd5
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
builtin/bisect--helper.c
View File

@ -10,11 +10,11 @@ static const char * const git_bisect_helper_usage[] = {
int cmd_bisect__helper(int argc, const char **argv, const char *prefix) int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
{ {
int next_all = 0; enum { NEXT_ALL = 1 } cmdmode = 0;
int no_checkout = 0; int no_checkout = 0;
struct option options[] = { struct option options[] = {
OPT_BOOL(0, "next-all", &next_all, OPT_CMDMODE(0, "next-all", &cmdmode,
N_("perform 'git bisect next'")), N_("perform 'git bisect next'"), NEXT_ALL),
OPT_BOOL(0, "no-checkout", &no_checkout, OPT_BOOL(0, "no-checkout", &no_checkout,
N_("update BISECT_HEAD instead of checking out the current commit")), N_("update BISECT_HEAD instead of checking out the current commit")),
OPT_END() OPT_END()
@ -23,9 +23,14 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
argc = parse_options(argc, argv, prefix, options, argc = parse_options(argc, argv, prefix, options,
git_bisect_helper_usage, 0); git_bisect_helper_usage, 0);
if (!next_all) if (!cmdmode)
usage_with_options(git_bisect_helper_usage, options); usage_with_options(git_bisect_helper_usage, options);
/* next-all */ switch (cmdmode) {
return bisect_next_all(prefix, no_checkout); case NEXT_ALL:
return bisect_next_all(prefix, no_checkout);
default:
return error("BUG: unknown subcommand '%d'", cmdmode);
}
return 0;
} }