mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bisect: further style nitpicks

Browse Source 
Fix a few remaining lines that indented with spaces.

Also simplify the logic of checking out the original branch and reporting
error during "bisect reset".

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano
2011-08-05 10:09:23 -07:00
parent eef12a9a77
commit 43b8ff4b14
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
git-bisect.sh
View File

@ -364,14 +364,12 @@ bisect_reset() {
*) *)
usage ;; usage ;;
esac esac
if ! test -f "$GIT_DIR/BISECT_HEAD"
then if ! test -f "$GIT_DIR/BISECT_HEAD" && ! git checkout "$branch" --
if ! git checkout "$branch" --
then then
die "$(eval_gettext "Could not check out original HEAD '\$branch'. die "$(eval_gettext "Could not check out original HEAD '\$branch'.
Try 'git bisect reset <commit>'.")" Try 'git bisect reset <commit>'.")"
fi fi
fi
bisect_clean_state bisect_clean_state
} }