summaryrefslogtreecommitdiff
path: root/git-bisect.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-10-17 21:37:09 -0700
committerJunio C Hamano <gitster@pobox.com>2011-10-17 21:37:09 -0700
commita9af6c451d68267a605b7b7385cdffa939b167b2 (patch)
treec1ab8437c6c3ac251074619b8457c2bc42b8e6d4 /git-bisect.sh
parente5fa45c159241b609bce40fa7a8687796e4b941d (diff)
parent1acf11717f01b542e099544796f00df567a66e90 (diff)
downloadgit-a9af6c451d68267a605b7b7385cdffa939b167b2.tar.gz
Merge branch 'js/bisect-no-checkout'
* js/bisect-no-checkout: bisect: fix exiting when checkout failed in bisect_start()
Diffstat (limited to 'git-bisect.sh')
-rwxr-xr-xgit-bisect.sh3
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.