Merge branch 'js/bisect-no-checkout'

* js/bisect-no-checkout: bisect: fix exiting when checkout failed in bisect_start()
13 years ago · a9af6c451d
1 changed files with 2 additions and 1 deletions
--- a/git-bisect.sh
+++ b/git-bisect.sh
@ -126,7 +126,8 @@ bisect_start() {
				@@ -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.