Skip to content

Commit 098a191

Browse files
gitstergitster
committed
Merge branch 'jc/test-modernization-2'
Test style updates. * jc/test-modernization-2: t9400-git-cvsserver-server: modernize test format t9200-git-cvsexportcommit: modernize test format t9104-git-svn-follow-parent: modernize test format t9100-git-svn-basic: modernize test format t7700-repack: modernize test format t7600-merge: modernize test format t7508-status: modernize test format t7201-co: modernize test format t7111-reset-table: modernize test format t7110-reset-merge: modernize test format
2 parents 208a28e + 447a3b7 commit 098a191

10 files changed

+739
-715
lines changed

‎t/t7110-reset-merge.sh

Lines changed: 157 additions & 157 deletions
Large diffs are not rendered by default.

‎t/t7111-reset-table.sh

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ TEST_PASSES_SANITIZE_LEAK=true
1010

1111

1212
test_expect_success 'creating initial commits' '
13-
test_commit E file1 &&
14-
test_commit D file1 &&
15-
test_commit C file1
13+
test_commit E file1 &&
14+
test_commit D file1 &&
15+
test_commit C file1
1616
'
1717

1818
while read W1 I1 H1 T opt W2 I2 H2
@@ -74,13 +74,13 @@ B C C C keep B C C
7474
EOF
7575

7676
test_expect_success 'setting up branches to test with unmerged entries' '
77-
git reset --hard C &&
78-
git branch branch1 &&
79-
git branch branch2 &&
80-
git checkout branch1 &&
81-
test_commit B1 file1 &&
82-
git checkout branch2 &&
83-
test_commit B file1
77+
git reset --hard C &&
78+
git branch branch1 &&
79+
git branch branch2 &&
80+
git checkout branch1 &&
81+
test_commit B1 file1 &&
82+
git checkout branch2 &&
83+
test_commit B file1
8484
'
8585

8686
while read W1 I1 H1 T opt W2 I2 H2

‎t/t7201-co.sh

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -372,75 +372,75 @@ test_expect_success 'checkout specific path while in subdirectory' '
372372
'
373373

374374
test_expect_success 'checkout w/--track sets up tracking' '
375-
git config branch.autosetupmerge false &&
376-
git checkout main &&
377-
git checkout --track -b track1 &&
378-
test "$(git config branch.track1.remote)" &&
379-
test "$(git config branch.track1.merge)"
375+
git config branch.autosetupmerge false &&
376+
git checkout main &&
377+
git checkout --track -b track1 &&
378+
test "$(git config branch.track1.remote)" &&
379+
test "$(git config branch.track1.merge)"
380380
'
381381

382382
test_expect_success 'checkout w/autosetupmerge=always sets up tracking' '
383-
test_when_finished git config branch.autosetupmerge false &&
384-
git config branch.autosetupmerge always &&
385-
git checkout main &&
386-
git checkout -b track2 &&
387-
test "$(git config branch.track2.remote)" &&
388-
test "$(git config branch.track2.merge)"
383+
test_when_finished git config branch.autosetupmerge false &&
384+
git config branch.autosetupmerge always &&
385+
git checkout main &&
386+
git checkout -b track2 &&
387+
test "$(git config branch.track2.remote)" &&
388+
test "$(git config branch.track2.merge)"
389389
'
390390

391391
test_expect_success 'checkout w/--track from non-branch HEAD fails' '
392-
git checkout main^0 &&
393-
test_must_fail git symbolic-ref HEAD &&
394-
test_must_fail git checkout --track -b track &&
395-
test_must_fail git rev-parse --verify track &&
396-
test_must_fail git symbolic-ref HEAD &&
397-
test "z$(git rev-parse main^0)" = "z$(git rev-parse HEAD)"
392+
git checkout main^0 &&
393+
test_must_fail git symbolic-ref HEAD &&
394+
test_must_fail git checkout --track -b track &&
395+
test_must_fail git rev-parse --verify track &&
396+
test_must_fail git symbolic-ref HEAD &&
397+
test "z$(git rev-parse main^0)" = "z$(git rev-parse HEAD)"
398398
'
399399

400400
test_expect_success 'checkout w/--track from tag fails' '
401-
git checkout main^0 &&
402-
test_must_fail git symbolic-ref HEAD &&
403-
test_must_fail git checkout --track -b track frotz &&
404-
test_must_fail git rev-parse --verify track &&
405-
test_must_fail git symbolic-ref HEAD &&
406-
test "z$(git rev-parse main^0)" = "z$(git rev-parse HEAD)"
401+
git checkout main^0 &&
402+
test_must_fail git symbolic-ref HEAD &&
403+
test_must_fail git checkout --track -b track frotz &&
404+
test_must_fail git rev-parse --verify track &&
405+
test_must_fail git symbolic-ref HEAD &&
406+
test "z$(git rev-parse main^0)" = "z$(git rev-parse HEAD)"
407407
'
408408

409409
test_expect_success 'detach a symbolic link HEAD' '
410-
git checkout main &&
411-
git config --bool core.prefersymlinkrefs yes &&
412-
git checkout side &&
413-
git checkout main &&
414-
it=$(git symbolic-ref HEAD) &&
415-
test "z$it" = zrefs/heads/main &&
416-
here=$(git rev-parse --verify refs/heads/main) &&
417-
git checkout side^ &&
418-
test "z$(git rev-parse --verify refs/heads/main)" = "z$here"
410+
git checkout main &&
411+
git config --bool core.prefersymlinkrefs yes &&
412+
git checkout side &&
413+
git checkout main &&
414+
it=$(git symbolic-ref HEAD) &&
415+
test "z$it" = zrefs/heads/main &&
416+
here=$(git rev-parse --verify refs/heads/main) &&
417+
git checkout side^ &&
418+
test "z$(git rev-parse --verify refs/heads/main)" = "z$here"
419419
'
420420

421421
test_expect_success 'checkout with --track fakes a sensible -b <name>' '
422-
git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*" &&
423-
git update-ref refs/remotes/origin/koala/bear renamer &&
422+
git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*" &&
423+
git update-ref refs/remotes/origin/koala/bear renamer &&
424424
425-
git checkout --track origin/koala/bear &&
426-
test "refs/heads/koala/bear" = "$(git symbolic-ref HEAD)" &&
427-
test "$(git rev-parse HEAD)" = "$(git rev-parse renamer)" &&
425+
git checkout --track origin/koala/bear &&
426+
test "refs/heads/koala/bear" = "$(git symbolic-ref HEAD)" &&
427+
test "$(git rev-parse HEAD)" = "$(git rev-parse renamer)" &&
428428
429-
git checkout main && git branch -D koala/bear &&
429+
git checkout main && git branch -D koala/bear &&
430430
431-
git checkout --track refs/remotes/origin/koala/bear &&
432-
test "refs/heads/koala/bear" = "$(git symbolic-ref HEAD)" &&
433-
test "$(git rev-parse HEAD)" = "$(git rev-parse renamer)" &&
431+
git checkout --track refs/remotes/origin/koala/bear &&
432+
test "refs/heads/koala/bear" = "$(git symbolic-ref HEAD)" &&
433+
test "$(git rev-parse HEAD)" = "$(git rev-parse renamer)" &&
434434
435-
git checkout main && git branch -D koala/bear &&
435+
git checkout main && git branch -D koala/bear &&
436436
437-
git checkout --track remotes/origin/koala/bear &&
438-
test "refs/heads/koala/bear" = "$(git symbolic-ref HEAD)" &&
439-
test "$(git rev-parse HEAD)" = "$(git rev-parse renamer)"
437+
git checkout --track remotes/origin/koala/bear &&
438+
test "refs/heads/koala/bear" = "$(git symbolic-ref HEAD)" &&
439+
test "$(git rev-parse HEAD)" = "$(git rev-parse renamer)"
440440
'
441441

442442
test_expect_success 'checkout with --track, but without -b, fails with too short tracked name' '
443-
test_must_fail git checkout --track renamer
443+
test_must_fail git checkout --track renamer
444444
'
445445

446446
setup_conflicting_index () {

‎t/t7508-status.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1519,8 +1519,8 @@ test_expect_success '"status.branch=true" weaker than "--no-branch"' '
15191519
'
15201520

15211521
test_expect_success '"status.branch=true" weaker than "--porcelain"' '
1522-
git -c status.branch=true status --porcelain >actual &&
1523-
test_cmp expected_nobranch actual
1522+
git -c status.branch=true status --porcelain >actual &&
1523+
test_cmp expected_nobranch actual
15241524
'
15251525

15261526
test_expect_success '"status.branch=false" same as "--no-branch"' '

‎t/t7600-merge.sh

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -639,41 +639,41 @@ test_expect_success 'merge log message' '
639639
test_debug 'git log --graph --decorate --oneline --all'
640640

641641
test_expect_success 'merge c1 with c0, c2, c0, and c1' '
642-
git reset --hard c1 &&
643-
test_tick &&
644-
git merge c0 c2 c0 c1 &&
645-
verify_merge file result.1-5 &&
646-
verify_parents $c1 $c2
642+
git reset --hard c1 &&
643+
test_tick &&
644+
git merge c0 c2 c0 c1 &&
645+
verify_merge file result.1-5 &&
646+
verify_parents $c1 $c2
647647
'
648648

649649
test_debug 'git log --graph --decorate --oneline --all'
650650

651651
test_expect_success 'merge c1 with c0, c2, c0, and c1' '
652-
git reset --hard c1 &&
653-
test_tick &&
654-
git merge c0 c2 c0 c1 &&
655-
verify_merge file result.1-5 &&
656-
verify_parents $c1 $c2
652+
git reset --hard c1 &&
653+
test_tick &&
654+
git merge c0 c2 c0 c1 &&
655+
verify_merge file result.1-5 &&
656+
verify_parents $c1 $c2
657657
'
658658

659659
test_debug 'git log --graph --decorate --oneline --all'
660660

661661
test_expect_success 'merge c1 with c1 and c2' '
662-
git reset --hard c1 &&
663-
test_tick &&
664-
git merge c1 c2 &&
665-
verify_merge file result.1-5 &&
666-
verify_parents $c1 $c2
662+
git reset --hard c1 &&
663+
test_tick &&
664+
git merge c1 c2 &&
665+
verify_merge file result.1-5 &&
666+
verify_parents $c1 $c2
667667
'
668668

669669
test_debug 'git log --graph --decorate --oneline --all'
670670

671671
test_expect_success 'merge fast-forward in a dirty tree' '
672-
git reset --hard c0 &&
673-
mv file file1 &&
674-
cat file1 >file &&
675-
rm -f file1 &&
676-
git merge c2
672+
git reset --hard c0 &&
673+
mv file file1 &&
674+
cat file1 >file &&
675+
rm -f file1 &&
676+
git merge c2
677677
'
678678

679679
test_debug 'git log --graph --decorate --oneline --all'

‎t/t7700-repack.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -460,10 +460,10 @@ test_expect_success '--write-midx -b packs non-kept objects' '
460460
'
461461

462462
test_expect_success '--write-midx removes stale pack-based bitmaps' '
463-
rm -fr repo &&
464-
git init repo &&
465-
test_when_finished "rm -fr repo" &&
466-
(
463+
rm -fr repo &&
464+
git init repo &&
465+
test_when_finished "rm -fr repo" &&
466+
(
467467
cd repo &&
468468
test_commit base &&
469469
GIT_TEST_MULTI_PACK_INDEX=0 git repack -Ab &&
@@ -477,7 +477,7 @@ test_expect_success '--write-midx removes stale pack-based bitmaps' '
477477
test_path_is_file $midx &&
478478
test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
479479
test_path_is_missing $pack_bitmap
480-
)
480+
)
481481
'
482482

483483
test_expect_success '--write-midx with --pack-kept-objects' '

‎t/t9100-git-svn-basic.sh

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ test_expect_success 'git svn help works anywhere' '
2121
'
2222

2323
test_expect_success \
24-
'initialize git svn' '
24+
'initialize git svn' '
2525
mkdir import &&
2626
(
2727
cd import &&
@@ -38,9 +38,9 @@ test_expect_success \
3838
rm -rf import &&
3939
git svn init "$svnrepo"'
4040

41-
test_expect_success \
42-
'import an SVN revision into git' \
43-
'git svn fetch'
41+
test_expect_success 'import an SVN revision into git' '
42+
git svn fetch
43+
'
4444

4545
test_expect_success "checkout from svn" 'svn co "$svnrepo" "$SVN_TREE"'
4646

@@ -233,27 +233,26 @@ test_expect_success POSIXPERM,SYMLINKS "$name" '
233233
'
234234

235235
test_expect_success 'exit if remote refs are ambigious' '
236-
git config --add svn-remote.svn.fetch \
236+
git config --add svn-remote.svn.fetch \
237237
bar:refs/remotes/git-svn &&
238238
test_must_fail git svn migrate
239239
'
240240

241241
test_expect_success 'exit if init-ing a would clobber a URL' '
242-
svnadmin create "${PWD}/svnrepo2" &&
243-
svn mkdir -m "mkdir bar" "${svnrepo}2/bar" &&
244-
git config --unset svn-remote.svn.fetch \
242+
svnadmin create "${PWD}/svnrepo2" &&
243+
svn mkdir -m "mkdir bar" "${svnrepo}2/bar" &&
244+
git config --unset svn-remote.svn.fetch \
245245
"^bar:refs/remotes/git-svn$" &&
246246
test_must_fail git svn init "${svnrepo}2/bar"
247247
'
248248

249-
test_expect_success \
250-
'init allows us to connect to another directory in the same repo' '
251-
git svn init --minimize-url -i bar "$svnrepo/bar" &&
252-
git config --get svn-remote.svn.fetch \
253-
"^bar:refs/remotes/bar$" &&
254-
git config --get svn-remote.svn.fetch \
255-
"^:refs/remotes/git-svn$"
256-
'
249+
test_expect_success 'init allows us to connect to another directory in the same repo' '
250+
git svn init --minimize-url -i bar "$svnrepo/bar" &&
251+
git config --get svn-remote.svn.fetch \
252+
"^bar:refs/remotes/bar$" &&
253+
git config --get svn-remote.svn.fetch \
254+
"^:refs/remotes/git-svn$"
255+
'
257256

258257
test_expect_success 'dcommit $rev does not clobber current branch' '
259258
git svn fetch -i bar &&

‎t/t9104-git-svn-follow-parent.sh

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -41,51 +41,51 @@ test_expect_success 'init and fetch a moved directory' '
4141
'
4242

4343
test_expect_success 'init and fetch from one svn-remote' '
44-
git config svn-remote.svn.url "$svnrepo" &&
45-
git config --add svn-remote.svn.fetch \
46-
trunk:refs/remotes/svn/trunk &&
47-
git config --add svn-remote.svn.fetch \
48-
thunk:refs/remotes/svn/thunk &&
49-
git svn fetch -i svn/thunk &&
44+
git config svn-remote.svn.url "$svnrepo" &&
45+
git config --add svn-remote.svn.fetch \
46+
trunk:refs/remotes/svn/trunk &&
47+
git config --add svn-remote.svn.fetch \
48+
thunk:refs/remotes/svn/thunk &&
49+
git svn fetch -i svn/thunk &&
5050
test "$(git rev-parse --verify refs/remotes/svn/trunk)" \
51-
= "$(git rev-parse --verify refs/remotes/svn/thunk~1)" &&
51+
= "$(git rev-parse --verify refs/remotes/svn/thunk~1)" &&
5252
git cat-file blob refs/remotes/svn/thunk:readme >actual &&
5353
test "$(sed -n -e "3p" actual)" = goodbye
54-
'
54+
'
5555

5656
test_expect_success 'follow deleted parent' '
57-
(svn_cmd cp -m "resurrecting trunk as junk" \
58-
"$svnrepo"/trunk@2 "$svnrepo"/junk ||
59-
svn cp -m "resurrecting trunk as junk" \
60-
-r2 "$svnrepo"/trunk "$svnrepo"/junk) &&
61-
git config --add svn-remote.svn.fetch \
62-
junk:refs/remotes/svn/junk &&
63-
git svn fetch -i svn/thunk &&
64-
git svn fetch -i svn/junk &&
57+
(svn_cmd cp -m "resurrecting trunk as junk" \
58+
"$svnrepo"/trunk@2 "$svnrepo"/junk ||
59+
svn cp -m "resurrecting trunk as junk" \
60+
-r2 "$svnrepo"/trunk "$svnrepo"/junk) &&
61+
git config --add svn-remote.svn.fetch \
62+
junk:refs/remotes/svn/junk &&
63+
git svn fetch -i svn/thunk &&
64+
git svn fetch -i svn/junk &&
6565
test -z "$(git diff svn/junk svn/trunk)" &&
6666
test "$(git merge-base svn/junk svn/trunk)" \
67-
= "$(git rev-parse svn/trunk)"
68-
'
67+
= "$(git rev-parse svn/trunk)"
68+
'
6969

7070
test_expect_success 'follow larger parent' '
71-
mkdir -p import/trunk/thunk/bump/thud &&
72-
echo hi > import/trunk/thunk/bump/thud/file &&
73-
svn import -m "import a larger parent" import "$svnrepo"/larger-parent &&
74-
svn cp -m "hi" "$svnrepo"/larger-parent "$svnrepo"/another-larger &&
75-
git svn init --minimize-url -i larger \
76-
"$svnrepo"/larger-parent/trunk/thunk/bump/thud &&
77-
git svn fetch -i larger &&
71+
mkdir -p import/trunk/thunk/bump/thud &&
72+
echo hi > import/trunk/thunk/bump/thud/file &&
73+
svn import -m "import a larger parent" import "$svnrepo"/larger-parent &&
74+
svn cp -m "hi" "$svnrepo"/larger-parent "$svnrepo"/another-larger &&
75+
git svn init --minimize-url -i larger \
76+
"$svnrepo"/larger-parent/trunk/thunk/bump/thud &&
77+
git svn fetch -i larger &&
7878
git svn init --minimize-url -i larger-parent \
79-
"$svnrepo"/another-larger/trunk/thunk/bump/thud &&
79+
"$svnrepo"/another-larger/trunk/thunk/bump/thud &&
8080
git svn fetch -i larger-parent &&
81-
git rev-parse --verify refs/remotes/larger &&
82-
git rev-parse --verify \
83-
refs/remotes/larger-parent &&
81+
git rev-parse --verify refs/remotes/larger &&
82+
git rev-parse --verify \
83+
refs/remotes/larger-parent &&
8484
test "$(git merge-base \
8585
refs/remotes/larger-parent \
8686
refs/remotes/larger)" = \
87-
"$(git rev-parse refs/remotes/larger)"
88-
'
87+
"$(git rev-parse refs/remotes/larger)"
88+
'
8989

9090
test_expect_success 'follow higher-level parent' '
9191
svn mkdir -m "follow higher-level parent" "$svnrepo"/blob &&

0 commit comments

Comments
 (0)