mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-22 14:48:15 +02:00
Code

Merge branch 'jn/bisect-coding-style'

Browse Source 
* jn/bisect-coding-style:
  git-bisect.sh: fix a few style issues
This commit is contained in:
Junio C Hamano 2014-03-14 14:27:11 -07:00
commit 117a355cda
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
git-bisect.sh
View File

@ -365,7 +365,7 @@ bisect_reset() {
} }
case "$#" in case "$#" in
0) branch=$(cat "$GIT_DIR/BISECT_START") ;; 0) branch=$(cat "$GIT_DIR/BISECT_START") ;;
1) git rev-parse --quiet --verify "$1^{commit}" > /dev/null || { 1) git rev-parse --quiet --verify "$1^{commit}" >/dev/null || {
invalid="$1" invalid="$1"
die "$(eval_gettext "'\$invalid' is not a valid commit")" die "$(eval_gettext "'\$invalid' is not a valid commit")"
} }
@ -458,13 +458,13 @@ exit code \$res from '\$command' is < 0 or >= 128" >&2
fi fi
# We have to use a subshell because "bisect_state" can exit. # We have to use a subshell because "bisect_state" can exit.
( bisect_state $state > "$GIT_DIR/BISECT_RUN" ) ( bisect_state $state >"$GIT_DIR/BISECT_RUN" )
res=$? res=$?
cat "$GIT_DIR/BISECT_RUN" cat "$GIT_DIR/BISECT_RUN"
if sane_grep "first bad commit could be any of" "$GIT_DIR/BISECT_RUN" \ if sane_grep "first bad commit could be any of" "$GIT_DIR/BISECT_RUN" \
> /dev/null >/dev/null
then then
gettextln "bisect run cannot continue any more" >&2 gettextln "bisect run cannot continue any more" >&2
exit $res exit $res
@ -477,7 +477,7 @@ exit code \$res from '\$command' is < 0 or >= 128" >&2
exit $res exit $res
fi fi
if sane_grep "is the first bad commit" "$GIT_DIR/BISECT_RUN" > /dev/null if sane_grep "is the first bad commit" "$GIT_DIR/BISECT_RUN" >/dev/null
then then
gettextln "bisect run success" gettextln "bisect run success"
exit 0; exit 0;