diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-11-01 16:03:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-11-01 16:03:35 -0700 |
| commit | dddc411f7abbd82f6fa7d323711b8a7b94a1abc2 (patch) | |
| tree | 370f40378e35bcf061c8cc362dc7dba6c693920d | |
| parent | a4fdd79f13ec0551be94d7a3ac57e87434239f11 (diff) | |
| parent | 1acf11717f01b542e099544796f00df567a66e90 (diff) | |
| download | git-dddc411f7abbd82f6fa7d323711b8a7b94a1abc2.tar.gz | |
Merge branch 'js/bisect-no-checkout' into maint
* 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. |