Merge branch 'js/bisect-no-checkout' into next

* js/bisect-no-checkout:
  bisect: fix exiting when checkout failed in bisect_start()
This commit is contained in:
Junio C Hamano 2011-10-06 15:41:53 -07:00
commit 0354e94b6b

View file

@ -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.