diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-10-17 21:37:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-17 21:37:09 -0700 |
| commit | a9af6c451d68267a605b7b7385cdffa939b167b2 (patch) | |
| tree | c1ab8437c6c3ac251074619b8457c2bc42b8e6d4 | |
| parent | resolve_gitlink_packed_ref(): fix mismerge (diff) | |
| parent | bisect: fix exiting when checkout failed in bisect_start() (diff) | |
| download | tgif-a9af6c451d68267a605b7b7385cdffa939b167b2.tar.xz | |
Merge branch 'js/bisect-no-checkout'
* js/bisect-no-checkout:
bisect: fix exiting when checkout failed in bisect_start()
| -rwxr-xr-x | git-bisect.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-bisect.sh b/git-bisect.sh index 2524060475..99efbe8845 100755 --- a/git-bisect.sh +++ b/git-bisect.sh @@ -126,7 +126,8 @@ bisect_start() { start_head=$(cat "$GIT_DIR/BISECT_START") if test "z$mode" != "z--no-checkout" then - git checkout "$start_head" -- + git checkout "$start_head" -- || + die "$(eval_gettext "Checking out '\$start_head' failed. Try 'git bisect reset <validbranch>'.")" fi else # Get rev from where we start. |