@@ -198,7 +198,8 @@ is_expected_rev() {
198
198
199
199
check_expected_revs () {
200
200
for _rev in " $@ " ; do
201
- if ! is_expected_rev " $_rev " ; then
201
+ if ! is_expected_rev " $_rev "
202
+ then
202
203
rm -f " $GIT_DIR /BISECT_ANCESTORS_OK"
203
204
rm -f " $GIT_DIR /BISECT_EXPECTED_REV"
204
205
return
@@ -331,7 +332,8 @@ bisect_visualize() {
331
332
if test $# = 0
332
333
then
333
334
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
335
337
set gitk
336
338
else
337
339
set git log
@@ -400,7 +402,8 @@ bisect_replay () {
400
402
while read git bisect command rev
401
403
do
402
404
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
404
407
rev=" $command "
405
408
command=" $bisect "
406
409
fi
@@ -428,7 +431,8 @@ bisect_run () {
428
431
res=$?
429
432
430
433
# 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
432
436
(
433
437
eval_gettext " bisect run failed:
434
438
exit code \$ res from '\$ command' is < 0 or >= 128" &&
@@ -439,9 +443,11 @@ exit code \$res from '\$command' is < 0 or >= 128" &&
439
443
440
444
# Find current state depending on run success or failure.
441
445
# A special exit code of 125 means cannot test.
442
- if [ $res -eq 125 ]; then
446
+ if [ $res -eq 125 ]
447
+ then
443
448
state=' skip'
444
- elif [ $res -gt 0 ]; then
449
+ elif [ $res -gt 0 ]
450
+ then
445
451
state=' bad'
446
452
else
447
453
state=' good'
@@ -454,15 +460,17 @@ exit code \$res from '\$command' is < 0 or >= 128" &&
454
460
cat " $GIT_DIR /BISECT_RUN"
455
461
456
462
if sane_grep " first bad commit could be any of" " $GIT_DIR /BISECT_RUN" \
457
- > /dev/null; then
463
+ > /dev/null
464
+ then
458
465
(
459
466
gettext " bisect run cannot continue any more" &&
460
467
echo
461
468
) >&2
462
469
exit $res
463
470
fi
464
471
465
- if [ $res -ne 0 ]; then
472
+ if [ $res -ne 0 ]
473
+ then
466
474
(
467
475
eval_gettext " bisect run failed:
468
476
'bisect_state \$ state' exited with error code \$ res" &&
@@ -471,7 +479,8 @@ exit code \$res from '\$command' is < 0 or >= 128" &&
471
479
exit $res
472
480
fi
473
481
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
475
484
gettext " bisect run success" ; echo
476
485
exit 0;
477
486
fi
0 commit comments