mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'js/bisect-no-checkout' into next
* js/bisect-no-checkout: bisect: fix exiting when checkout failed in bisect_start()
This commit is contained in:
commit
0354e94b6b
|
@ -126,7 +126,8 @@ bisect_start() {
|
||||||
start_head=$(cat "$GIT_DIR/BISECT_START")
|
start_head=$(cat "$GIT_DIR/BISECT_START")
|
||||||
if test "z$mode" != "z--no-checkout"
|
if test "z$mode" != "z--no-checkout"
|
||||||
then
|
then
|
||||||
git checkout "$start_head" --
|
git checkout "$start_head" -- ||
|
||||||
|
die "$(eval_gettext "Checking out '\$start_head' failed. Try 'git bisect reset <validbranch>'.")"
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
# Get rev from where we start.
|
# Get rev from where we start.
|
||||||
|
|
Loading…
Reference in a new issue