diff options
| author | Aaron Lipman <alipman88@gmail.com> | 2020-08-07 23:58:36 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-08-08 00:13:03 +0200 |
| commit | be5fe2000df5c1110d8086e4704e1a90a64f7387 (patch) | |
| tree | 48f5b012d6f90197c2ff1b94e67d192ed615a0e2 /git-bisect.sh | |
| parent | rev-list: allow bisect and first-parent flags (diff) | |
| download | git-be5fe2000df5c1110d8086e4704e1a90a64f7387.tar.xz git-be5fe2000df5c1110d8086e4704e1a90a64f7387.zip | |
cmd_bisect__helper: defer parsing no-checkout flag
cmd_bisect__helper() is intended as a temporary shim layer serving as an
interface for git-bisect.sh. This function and git-bisect.sh should
eventually be replaced by a C implementation, cmd_bisect(), serving as
an entrypoint for all "git bisect ..." shell commands: cmd_bisect() will
only parse the first token following "git bisect", and dispatch the
remaining args to the appropriate function ["bisect_start()",
"bisect_next()", etc.].
Thus, cmd_bisect__helper() should not be responsible for parsing flags
like --no-checkout. Instead, let the --no-checkout flag remain in the
argv array, so it may be evaluated alongside the other options already
parsed by bisect_start().
Signed-off-by: Aaron Lipman <alipman88@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to '')
| -rwxr-xr-x | git-bisect.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-bisect.sh b/git-bisect.sh index 08a6ed57dd..8fbda2e2c7 100755 --- a/git-bisect.sh +++ b/git-bisect.sh @@ -153,7 +153,7 @@ bisect_next() { git bisect--helper --bisect-next-check $TERM_GOOD $TERM_BAD $TERM_GOOD|| exit # Perform all bisection computation, display and checkout - git bisect--helper --next-all $(test -f "$GIT_DIR/BISECT_HEAD" && echo --no-checkout) + git bisect--helper --next-all res=$? # Check if we should exit because bisection is finished |