t7000-t7999: fix broken &&-chains
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Eric Sunshine committed
Jul 1, 2018 at 20:24 UTC
e974e06de01aede87161fb04cfeb119343bb7594
7 files changed
+57
-57
t/t7001-mv.sh
+1
-1
@@ -509,7 +509,7 @@ test_expect_success 'moving nested submodules' '
509
touch nested_level1 &&
510
git init &&
511
git add . &&
512
- git commit -m "nested level 1"
512
+ git commit -m "nested level 1" &&
513
git submodule add ../sub_nested_nested &&
514
git commit -m "add nested level 2"
515
) &&
t/t7201-co.sh
+20
-20
@@ -528,10 +528,10 @@ test_expect_success 'checkout with --merge' '
528
cat sample >filf &&
529
git checkout -m -- fild file filf &&
530
(
531
- echo "<<<<<<< ours"
532
- echo ourside
533
- echo "======="
534
- echo theirside
531
+ echo "<<<<<<< ours" &&
532
+ echo ourside &&
533
+ echo "=======" &&
534
+ echo theirside &&
535
echo ">>>>>>> theirs"
536
) >merged &&
537
test_cmp expect fild &&
@@ -549,12 +549,12 @@ test_expect_success 'checkout with --merge, in diff3 -m style' '
549
cat sample >filf &&
550
git checkout -m -- fild file filf &&
551
(
552
- echo "<<<<<<< ours"
553
- echo ourside
554
- echo "||||||| base"
555
- echo original
556
- echo "======="
557
- echo theirside
552
+ echo "<<<<<<< ours" &&
553
+ echo ourside &&
554
+ echo "||||||| base" &&
555
+ echo original &&
556
+ echo "=======" &&
557
+ echo theirside &&
558
echo ">>>>>>> theirs"
559
) >merged &&
560
test_cmp expect fild &&
@@ -572,10 +572,10 @@ test_expect_success 'checkout --conflict=merge, overriding config' '
572
cat sample >filf &&
573
git checkout --conflict=merge -- fild file filf &&
574
(
575
- echo "<<<<<<< ours"
576
- echo ourside
577
- echo "======="
578
- echo theirside
575
+ echo "<<<<<<< ours" &&
576
+ echo ourside &&
577
+ echo "=======" &&
578
+ echo theirside &&
579
echo ">>>>>>> theirs"
580
) >merged &&
581
test_cmp expect fild &&
@@ -593,12 +593,12 @@ test_expect_success 'checkout --conflict=diff3' '
593
cat sample >filf &&
594
git checkout --conflict=diff3 -- fild file filf &&
595
(
596
- echo "<<<<<<< ours"
597
- echo ourside
598
- echo "||||||| base"
599
- echo original
600
- echo "======="
601
- echo theirside
596
+ echo "<<<<<<< ours" &&
597
+ echo ourside &&
598
+ echo "||||||| base" &&
599
+ echo original &&
600
+ echo "=======" &&
601
+ echo theirside &&
602
echo ">>>>>>> theirs"
603
) >merged &&
604
test_cmp expect fild &&
t/t7400-submodule-basic.sh
+1
-1
@@ -819,7 +819,7 @@ test_expect_success '../bar/a/b/c works with relative local path - ../foo/bar.gi
819
cp pristine-.git-config .git/config &&
820
cp pristine-.gitmodules .gitmodules &&
821
mkdir -p a/b/c &&
822
- (cd a/b/c; git init) &&
822
+ (cd a/b/c && git init) &&
823
git config remote.origin.url ../foo/bar.git &&
824
git submodule add ../bar/a/b/c ./a/b/c &&
825
git submodule init &&
t/t7406-submodule-update.sh
+3
-3
@@ -865,9 +865,9 @@ test_expect_success 'submodule update places git-dir in superprojects git-dir re
865
(cd submodule/subsubmodule &&
866
git log > ../../expected
867
) &&
868
- (cd .git/modules/submodule/modules/subsubmodule
868
+ (cd .git/modules/submodule/modules/subsubmodule &&
869
git log > ../../../../../actual
870
- )
870
+ ) &&
871
test_cmp actual expected
872
)
873
'
@@ -886,7 +886,7 @@ test_expect_success 'submodule update properly revives a moved submodule' '
886
git commit -am "pre move" &&
887
H2=$(git rev-parse --short HEAD) &&
888
git status | sed "s/$H/XXX/" >expect &&
889
- H=$(cd submodule2; git rev-parse HEAD) &&
889
+ H=$(cd submodule2 && git rev-parse HEAD) &&
890
git rm --cached submodule2 &&
891
rm -rf submodule2 &&
892
mkdir -p "moved/sub module" &&
t/t7408-submodule-reference.sh
+1
-1
@@ -148,7 +148,7 @@ test_expect_success 'preparing second superproject with a nested submodule plus
148
cd supersuper &&
149
echo "I am super super." >file &&
150
git add file &&
151
- git commit -m B-super-super-initial
151
+ git commit -m B-super-super-initial &&
152
git submodule add "file://$base_dir/super" subwithsub &&
153
git commit -m B-super-super-added &&
154
git submodule update --init --recursive &&
t/t7501-commit.sh
+26
-26
@@ -411,8 +411,8 @@ test_expect_success 'sign off (1)' '
411
git commit -s -m "thank you" &&
412
git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
413
(
414
- echo thank you
415
- echo
414
+ echo thank you &&
415
+ echo &&
416
git var GIT_COMMITTER_IDENT |
417
sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /"
418
) >expected &&
@@ -430,9 +430,9 @@ test_expect_success 'sign off (2)' '
430
$existing" &&
431
git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
432
(
433
- echo thank you
434
- echo
435
- echo $existing
433
+ echo thank you &&
434
+ echo &&
435
+ echo $existing &&
436
git var GIT_COMMITTER_IDENT |
437
sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /"
438
) >expected &&
@@ -450,9 +450,9 @@ test_expect_success 'signoff gap' '
450
$alt" &&
451
git cat-file commit HEAD | sed -e "1,/^\$/d" > actual &&
452
(
453
- echo welcome
454
- echo
455
- echo $alt
453
+ echo welcome &&
454
+ echo &&
455
+ echo $alt &&
456
git var GIT_COMMITTER_IDENT |
457
sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /"
458
) >expected &&
@@ -470,11 +470,11 @@ We have now
470
$alt" &&
471
git cat-file commit HEAD | sed -e "1,/^\$/d" > actual &&
472
(
473
- echo welcome
474
- echo
475
- echo We have now
476
- echo $alt
477
- echo
473
+ echo welcome &&
474
+ echo &&
475
+ echo We have now &&
476
+ echo $alt &&
477
+ echo &&
478
git var GIT_COMMITTER_IDENT |
479
sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /"
480
) >expected &&
@@ -491,11 +491,11 @@ non-trailer line
491
Myfooter: x" &&
492
git cat-file commit HEAD | sed -e "1,/^\$/d" > actual &&
493
(
494
- echo subject
495
- echo
496
- echo non-trailer line
497
- echo Myfooter: x
498
- echo
494
+ echo subject &&
495
+ echo &&
496
+ echo non-trailer line &&
497
+ echo Myfooter: x &&
498
+ echo &&
499
echo "Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>"
500
) >expected &&
501
test_cmp expected actual &&
@@ -508,10 +508,10 @@ non-trailer line
508
Myfooter: x" &&
509
git cat-file commit HEAD | sed -e "1,/^\$/d" > actual &&
510
(
511
- echo subject
512
- echo
513
- echo non-trailer line
514
- echo Myfooter: x
511
+ echo subject &&
512
+ echo &&
513
+ echo non-trailer line &&
514
+ echo Myfooter: x &&
515
echo "Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>"
516
) >expected &&
517
test_cmp expected actual
@@ -524,10 +524,10 @@ test_expect_success 'multiple -m' '
524
git commit -m "one" -m "two" -m "three" &&
525
git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
526
(
527
- echo one
528
- echo
529
- echo two
530
- echo
527
+ echo one &&
528
+ echo &&
529
+ echo two &&
530
+ echo &&
531
echo three
532
) >expected &&
533
test_cmp expected actual
t/t7506-status-submodule.sh
+5
-5
@@ -193,9 +193,9 @@ test_expect_success 'status with added and untracked file in modified submodule
193
194
test_expect_success 'setup .git file for sub' '
195
(cd sub &&
196
- rm -f new-file
196
+ rm -f new-file &&
197
REAL="$(pwd)/../.real" &&
198
- mv .git "$REAL"
198
+ mv .git "$REAL" &&
199
echo "gitdir: $REAL" >.git) &&
200
echo .real >>.gitignore &&
201
git commit -m "added .real to .gitignore" .gitignore
@@ -209,12 +209,12 @@ test_expect_success 'status with added file in modified submodule with .git file
209
210
test_expect_success 'status with a lot of untracked files in the submodule' '
211
(
212
- cd sub
212
+ cd sub &&
213
i=0 &&
214
while test $i -lt 1024
215
do
216
- >some-file-$i
217
- i=$(( $i + 1 ))
216
+ >some-file-$i &&
217
+ i=$(( $i + 1 )) || exit 1
218
done
219
) &&
220
git status --porcelain sub 2>err.actual &&