Skip to content

Commit eef12a9

Browse files
jonseymourgitster
authored andcommitted
bisect: replace "; then" with "\n<tab>*then"
Signed-off-by: Jon Seymour <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 6021be8 commit eef12a9

File tree

1 file changed

+18
-9
lines changed

1 file changed

+18
-9
lines changed

git-bisect.sh

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,8 @@ is_expected_rev() {
198198

199199
check_expected_revs() {
200200
for _rev in "$@"; do
201-
if ! is_expected_rev "$_rev"; then
201+
if ! is_expected_rev "$_rev"
202+
then
202203
rm -f "$GIT_DIR/BISECT_ANCESTORS_OK"
203204
rm -f "$GIT_DIR/BISECT_EXPECTED_REV"
204205
return
@@ -331,7 +332,8 @@ bisect_visualize() {
331332
if test $# = 0
332333
then
333334
if test -n "${DISPLAY+set}${SESSIONNAME+set}${MSYSTEM+set}${SECURITYSESSIONID+set}" &&
334-
type gitk >/dev/null 2>&1; then
335+
type gitk >/dev/null 2>&1
336+
then
335337
set gitk
336338
else
337339
set git log
@@ -400,7 +402,8 @@ bisect_replay () {
400402
while read git bisect command rev
401403
do
402404
test "$git $bisect" = "git bisect" -o "$git" = "git-bisect" || continue
403-
if test "$git" = "git-bisect"; then
405+
if test "$git" = "git-bisect"
406+
then
404407
rev="$command"
405408
command="$bisect"
406409
fi
@@ -428,7 +431,8 @@ bisect_run () {
428431
res=$?
429432

430433
# Check for really bad run error.
431-
if [ $res -lt 0 -o $res -ge 128 ]; then
434+
if [ $res -lt 0 -o $res -ge 128 ]
435+
then
432436
(
433437
eval_gettext "bisect run failed:
434438
exit code \$res from '\$command' is < 0 or >= 128" &&
@@ -439,9 +443,11 @@ exit code \$res from '\$command' is < 0 or >= 128" &&
439443

440444
# Find current state depending on run success or failure.
441445
# A special exit code of 125 means cannot test.
442-
if [ $res -eq 125 ]; then
446+
if [ $res -eq 125 ]
447+
then
443448
state='skip'
444-
elif [ $res -gt 0 ]; then
449+
elif [ $res -gt 0 ]
450+
then
445451
state='bad'
446452
else
447453
state='good'
@@ -454,15 +460,17 @@ exit code \$res from '\$command' is < 0 or >= 128" &&
454460
cat "$GIT_DIR/BISECT_RUN"
455461

456462
if sane_grep "first bad commit could be any of" "$GIT_DIR/BISECT_RUN" \
457-
> /dev/null; then
463+
> /dev/null
464+
then
458465
(
459466
gettext "bisect run cannot continue any more" &&
460467
echo
461468
) >&2
462469
exit $res
463470
fi
464471

465-
if [ $res -ne 0 ]; then
472+
if [ $res -ne 0 ]
473+
then
466474
(
467475
eval_gettext "bisect run failed:
468476
'bisect_state \$state' exited with error code \$res" &&
@@ -471,7 +479,8 @@ exit code \$res from '\$command' is < 0 or >= 128" &&
471479
exit $res
472480
fi
473481

474-
if sane_grep "is the first bad commit" "$GIT_DIR/BISECT_RUN" > /dev/null; then
482+
if sane_grep "is the first bad commit" "$GIT_DIR/BISECT_RUN" > /dev/null
483+
then
475484
gettext "bisect run success"; echo
476485
exit 0;
477486
fi

0 commit comments

Comments
 (0)