bisect: fix exiting when checkout failed in bisect_start()
Commit 4796e823 ("bisect: introduce --no-checkout support into porcelain." Aug 4 2011) made checking out the branch where we started depends on the "checkout" mode. But unfortunately it lost the "|| exit" part after the checkout command. As it makes no sense to continue if the checkout failed and as people have already complained that the error message given when we just exit in this case is not clear, see: http://thread.gmane.org/gmane.comp.version-control.git/180733/ this patch adds a "|| die <hopefully clear message>" part after the checkout command. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Acked-by: Jon Seymour <jon.seymour@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Christian Couder committed
Sep 21, 2011 at 07:17 UTC
1acf11717f01b542e099544796f00df567a66e90
1 file changed
+2
-1
git-bisect.sh
+2
-1
@@ -129,7 +129,8 @@ bisect_start() {
129
start_head=$(cat "$GIT_DIR/BISECT_START")
130
if test "z$mode" != "z--no-checkout"
131
then
132
- git checkout "$start_head" --
132
+ git checkout "$start_head" -- ||
133
+ die "$(eval_gettext "Checking out '\$start_head' failed. Try 'git bisect reset <validbranch>'.")"
134
fi
135
else
136
# Get rev from where we start.