зеркало из https://github.com/microsoft/git.git
Merge branch 'js/bisect-no-checkout' into maint
* js/bisect-no-checkout: bisect: fix exiting when checkout failed in bisect_start()
This commit is contained in:
Коммит
dddc411f7a
|
@ -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.
|
||||
|
|
Загрузка…
Ссылка в новой задаче