Skip to content

Commit dddc411

Browse files
committed
Merge branch 'js/bisect-no-checkout' into maint
* js/bisect-no-checkout: bisect: fix exiting when checkout failed in bisect_start()
2 parents a4fdd79 + 1acf117 commit dddc411

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

git-bisect.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,8 @@ bisect_start() {
126126
start_head=$(cat "$GIT_DIR/BISECT_START")
127127
if test "z$mode" != "z--no-checkout"
128128
then
129-
git checkout "$start_head" --
129+
git checkout "$start_head" -- ||
130+
die "$(eval_gettext "Checking out '\$start_head' failed. Try 'git bisect reset <validbranch>'.")"
130131
fi
131132
else
132133
# Get rev from where we start.

0 commit comments

Comments
 (0)