Skip to content

Commit

Permalink
Merge branch 'jn/bisect-coding-style'
Browse files Browse the repository at this point in the history
* jn/bisect-coding-style:
  git-bisect.sh: fix a few style issues
  • Loading branch information
Junio C Hamano committed Mar 14, 2014
2 parents 3e30cb0 + 305a233 commit 117a355
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions git-bisect.sh
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ bisect_reset() {
}
case "$#" in
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"
die "$(eval_gettext "'\$invalid' is not a valid commit")"
}
Expand Down Expand Up @@ -458,13 +458,13 @@ exit code \$res from '\$command' is < 0 or >= 128" >&2
fi

# 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=$?

cat "$GIT_DIR/BISECT_RUN"

if sane_grep "first bad commit could be any of" "$GIT_DIR/BISECT_RUN" \
> /dev/null
>/dev/null
then
gettextln "bisect run cannot continue any more" >&2
exit $res
Expand All @@ -477,7 +477,7 @@ exit code \$res from '\$command' is < 0 or >= 128" >&2
exit $res
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
gettextln "bisect run success"
exit 0;
Expand Down

0 comments on commit 117a355

Please sign in to comment.