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

* js/bisect-no-checkout: bisect: fix exiting when checkout failed in bisect_start()
peff · Nov 1, 2011 · dddc411 · dddc411
2 parents a4fdd79 + 1acf117
commit dddc411
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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.