t6302: use `main` as initial branch name
In 66713e84e71 (tests: prepare aligned mentions of the default branch name, 2020-10-23), we started adjusting this test script for the default initial branch name changing to `main`. However, there is no need to wait for that: let's adjust the test script to stop relying on a specific initial branch name by setting it explicitly. This allows us to drop the `PREPARE_FOR_MAIN_BRANCH` prereq from six test cases. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Dec 17, 2020 at 01:07 UTC
2dbd00a7a1d625fd5763ea1e774ad62e5de8d7b3
1 file changed
+30
-29
t/t6302-for-each-ref-filter.sh
+30
-29
@@ -7,6 +7,7 @@ test_description='test for-each-refs usage of ref-filter APIs'
7
8
test_expect_success 'setup some history and refs' '
9
test_commit one &&
10
+ git branch -M main &&
11
test_commit two &&
12
test_commit three &&
13
git checkout -b side &&
@@ -26,17 +27,17 @@ test_expect_success 'setup some history and refs' '
27
git tag $sign -m "A signed tag" signed-tag &&
28
git tag $sign -m "Signed doubly" doubly-signed-tag signed-tag &&
29
29
- git checkout master &&
30
- git update-ref refs/odd/spot master
30
+ git checkout main &&
31
+ git update-ref refs/odd/spot main
32
'
33
34
test_expect_success 'filtering with --points-at' '
35
cat >expect <<-\EOF &&
35
- refs/heads/master
36
+ refs/heads/main
37
refs/odd/spot
38
refs/tags/three
39
EOF
39
- git for-each-ref --format="%(refname)" --points-at=master >actual &&
40
+ git for-each-ref --format="%(refname)" --points-at=main >actual &&
41
test_cmp expect actual
42
'
43
@@ -53,13 +54,13 @@ test_expect_success 'check signed tags with --points-at' '
54
55
test_expect_success 'filtering with --merged' '
56
cat >expect <<-\EOF &&
56
- refs/heads/master
57
+ refs/heads/main
58
refs/odd/spot
59
refs/tags/one
60
refs/tags/three
61
refs/tags/two
62
EOF
62
- git for-each-ref --format="%(refname)" --merged=master >actual &&
63
+ git for-each-ref --format="%(refname)" --merged=main >actual &&
64
test_cmp expect actual
65
'
66
@@ -72,13 +73,13 @@ test_expect_success 'filtering with --no-merged' '
73
refs/tags/four
74
refs/tags/signed-tag
75
EOF
75
- git for-each-ref --format="%(refname)" --no-merged=master >actual &&
76
+ git for-each-ref --format="%(refname)" --no-merged=main >actual &&
77
test_cmp expect actual
78
'
79
80
test_expect_success 'filtering with --contains' '
81
cat >expect <<-\EOF &&
81
- refs/heads/master
82
+ refs/heads/main
83
refs/heads/side
84
refs/odd/spot
85
refs/tags/annotated-tag
@@ -113,7 +114,7 @@ test_expect_success '%(color) must fail' '
114
test_must_fail git for-each-ref --format="%(color)%(refname)"
115
'
116
116
-test_expect_success PREPARE_FOR_MAIN_BRANCH 'left alignment is default' '
117
+test_expect_success 'left alignment is default' '
118
cat >expect <<-\EOF &&
119
refname is refs/heads/main |refs/heads/main
120
refname is refs/heads/side |refs/heads/side
@@ -131,7 +132,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH 'left alignment is default' '
132
test_cmp expect actual
133
'
134
134
-test_expect_success PREPARE_FOR_MAIN_BRANCH 'middle alignment' '
135
+test_expect_success 'middle alignment' '
136
cat >expect <<-\EOF &&
137
| refname is refs/heads/main |refs/heads/main
138
| refname is refs/heads/side |refs/heads/side
@@ -149,7 +150,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH 'middle alignment' '
150
test_cmp expect actual
151
'
152
152
-test_expect_success PREPARE_FOR_MAIN_BRANCH 'right alignment' '
153
+test_expect_success 'right alignment' '
154
cat >expect <<-\EOF &&
155
| refname is refs/heads/main|refs/heads/main
156
| refname is refs/heads/side|refs/heads/side
@@ -184,7 +185,7 @@ EOF
185
test_align_permutations() {
186
while read -r option
187
do
187
- test_expect_success PREPARE_FOR_MAIN_BRANCH "align:$option" '
188
+ test_expect_success "align:$option" '
189
git for-each-ref --format="|%(align:$option)refname is %(refname)%(end)|%(refname)" >actual &&
190
test_cmp expect actual
191
'
@@ -213,7 +214,7 @@ EOF
214
215
# Individual atoms inside %(align:...) and %(end) must not be quoted.
216
216
-test_expect_success PREPARE_FOR_MAIN_BRANCH 'alignment with format quote' "
217
+test_expect_success 'alignment with format quote' "
218
cat >expect <<-\EOF &&
219
|' '\''main| A U Thor'\'' '|
220
|' '\''side| A U Thor'\'' '|
@@ -231,7 +232,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH 'alignment with format quote' "
232
test_cmp expect actual
233
"
234
234
-test_expect_success PREPARE_FOR_MAIN_BRANCH 'nested alignment with quote formatting' "
235
+test_expect_success 'nested alignment with quote formatting' "
236
cat >expect <<-\EOF &&
237
|' main '|
238
|' side '|
@@ -251,7 +252,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH 'nested alignment with quote formatt
252
253
test_expect_success 'check `%(contents:lines=1)`' '
254
cat >expect <<-\EOF &&
254
- master |three
255
+ main |three
256
side |four
257
odd/spot |three
258
annotated-tag |An annotated tag
@@ -269,7 +270,7 @@ test_expect_success 'check `%(contents:lines=1)`' '
270
271
test_expect_success 'check `%(contents:lines=0)`' '
272
cat >expect <<-\EOF &&
272
- master |
273
+ main |
274
side |
275
odd/spot |
276
annotated-tag |
@@ -287,7 +288,7 @@ test_expect_success 'check `%(contents:lines=0)`' '
288
289
test_expect_success 'check `%(contents:lines=99999)`' '
290
cat >expect <<-\EOF &&
290
- master |three
291
+ main |three
292
side |four
293
odd/spot |three
294
annotated-tag |An annotated tag
@@ -360,7 +361,7 @@ test_expect_success 'improper usage of %(if), %(then), %(else) and %(end) atoms'
361
test_expect_success 'check %(if)...%(then)...%(end) atoms' '
362
git for-each-ref --format="%(refname)%(if)%(authorname)%(then) Author: %(authorname)%(end)" >actual &&
363
cat >expect <<-\EOF &&
363
- refs/heads/master Author: A U Thor
364
+ refs/heads/main Author: A U Thor
365
refs/heads/side Author: A U Thor
366
refs/odd/spot Author: A U Thor
367
refs/tags/annotated-tag
@@ -381,7 +382,7 @@ test_expect_success 'check %(if)...%(then)...%(end) atoms' '
382
test_expect_success 'check %(if)...%(then)...%(else)...%(end) atoms' '
383
git for-each-ref --format="%(if)%(authorname)%(then)%(authorname)%(else)No author%(end): %(refname)" >actual &&
384
cat >expect <<-\EOF &&
384
- A U Thor: refs/heads/master
385
+ A U Thor: refs/heads/main
386
A U Thor: refs/heads/side
387
A U Thor: refs/odd/spot
388
No author: refs/tags/annotated-tag
@@ -401,7 +402,7 @@ test_expect_success 'check %(if)...%(then)...%(else)...%(end) atoms' '
402
test_expect_success 'ignore spaces in %(if) atom usage' '
403
git for-each-ref --format="%(refname:short): %(if)%(HEAD)%(then)Head ref%(else)Not Head ref%(end)" >actual &&
404
cat >expect <<-\EOF &&
404
- master: Head ref
405
+ main: Head ref
406
side: Not Head ref
407
odd/spot: Not Head ref
408
annotated-tag: Not Head ref
@@ -420,19 +421,19 @@ test_expect_success 'ignore spaces in %(if) atom usage' '
421
'
422
423
test_expect_success 'check %(if:equals=<string>)' '
423
- git for-each-ref --format="%(if:equals=master)%(refname:short)%(then)Found master%(else)Not master%(end)" refs/heads/ >actual &&
424
+ git for-each-ref --format="%(if:equals=main)%(refname:short)%(then)Found main%(else)Not main%(end)" refs/heads/ >actual &&
425
cat >expect <<-\EOF &&
425
- Found master
426
- Not master
426
+ Found main
427
+ Not main
428
EOF
429
test_cmp expect actual
430
'
431
432
test_expect_success 'check %(if:notequals=<string>)' '
432
- git for-each-ref --format="%(if:notequals=master)%(refname:short)%(then)Not master%(else)Found master%(end)" refs/heads/ >actual &&
433
+ git for-each-ref --format="%(if:notequals=main)%(refname:short)%(then)Not main%(else)Found main%(end)" refs/heads/ >actual &&
434
cat >expect <<-\EOF &&
434
- Found master
435
- Not master
435
+ Found main
436
+ Not main
437
EOF
438
test_cmp expect actual
439
'
@@ -443,11 +444,11 @@ test_expect_success '--merged is compatible with --no-merged' '
444
445
test_expect_success 'validate worktree atom' '
446
cat >expect <<-EOF &&
446
- master: $(pwd)
447
- master_worktree: $(pwd)/worktree_dir
447
+ main: $(pwd)
448
+ main_worktree: $(pwd)/worktree_dir
449
side: not checked out
450
EOF
450
- git worktree add -b master_worktree worktree_dir master &&
451
+ git worktree add -b main_worktree worktree_dir main &&
452
git for-each-ref --format="%(refname:short): %(if)%(worktreepath)%(then)%(worktreepath)%(else)not checked out%(end)" refs/heads/ >actual &&
453
rm -r worktree_dir &&
454
git worktree prune &&