Permalink
Browse files

Merge branch 'js/bisect-no-checkout'

* js/bisect-no-checkout:
  bisect: fix exiting when checkout failed in bisect_start()
  • Loading branch information...
2 parents e5fa45c + 1acf117 commit a9af6c451d68267a605b7b7385cdffa939b167b2 @gitster gitster committed Oct 18, 2011
Showing with 2 additions and 1 deletion.
  1. +2 −1 git-bisect.sh
View
@@ -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.

0 comments on commit a9af6c4

Please sign in to comment.