mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-18 19:13:58 +01:00
Code

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

Browse Source 
* js/bisect-no-checkout:
  bisect: fix exiting when checkout failed in bisect_start()
This commit is contained in:
Junio C Hamano 2011-11-01 16:03:35 -07:00
commit dddc411f7a
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
git-bisect.sh
View File

@ -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.