From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 1 Nov 2011 23:03:35 +0000 (-0700)
Subject: Merge branch 'js/bisect-no-checkout' into maint
X-Git-Tag: v1.7.7.2~5
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/dddc411f7abbd82f6fa7d323711b8a7b94a1abc2?hp=a4fdd79f13ec0551be94d7a3ac57e87434239f11

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

* js/bisect-no-checkout:
bisect: fix exiting when checkout failed in bisect_start()
---

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.