@@ -1323,16 +1323,6 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
set_terms(&terms, "bad", "good");
res = bisect_start(&terms, argv, argc);
break;
- case BISECT_STATE:
- set_terms(&terms, "bad", "good");
- get_terms(&terms);
- if (!cmdmode &&
- (!argc || check_and_set_terms(&terms, argv[0]))) {
- char *msg = xstrfmt(_("unknown command: '%s'"), argv[0]);
- usage_msg_opt(msg, git_bisect_helper_usage, options);
- }
- res = bisect_state(&terms, argv, argc);
- break;
case BISECT_TERMS:
if (argc > 1)
return error(_("--bisect-terms requires 0 or 1 argument"));
@@ -1375,6 +1365,16 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
get_terms(&terms);
res = bisect_run(&terms, argv, argc);
break;
+ case BISECT_STATE:
+ set_terms(&terms, "bad", "good");
+ get_terms(&terms);
+ if (!cmdmode &&
+ (!argc || check_and_set_terms(&terms, argv[0]))) {
+ char *msg = xstrfmt(_("unknown command: '%s'"), argv[0]);
+ usage_msg_opt(msg, git_bisect_helper_usage, options);
+ }
+ res = bisect_state(&terms, argv, argc);
+ break;
default:
BUG("unknown subcommand %d", cmdmode);
}