t5510: use `main` as initial branch name
In 66713e84e71 (tests: prepare aligned mentions of the default branch name, 2020-10-23), we prepared this test script for a time when the default initial branch name would be `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 two 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
83ecf26ee7074277fee3987d1684cbecf4d61a61
1 file changed
+85
-83
t/t5510-fetch.sh
+85
-83
@@ -25,7 +25,9 @@ convert_bundle_to_pack () {
25
test_expect_success setup '
26
echo >file original &&
27
git add file &&
28
- git commit -a -m original'
28
+ git commit -a -m original &&
29
+ git branch -M main
30
+'
31
32
test_expect_success "clone and setup child repos" '
33
git clone . one &&
@@ -37,19 +39,19 @@ test_expect_success "clone and setup child repos" '
39
git clone . two &&
40
(
41
cd two &&
40
- git config branch.master.remote one &&
42
+ git config branch.main.remote one &&
43
git config remote.one.url ../one/.git/ &&
42
- git config remote.one.fetch refs/heads/master:refs/heads/one
44
+ git config remote.one.fetch refs/heads/main:refs/heads/one
45
) &&
46
git clone . three &&
47
(
48
cd three &&
47
- git config branch.master.remote two &&
48
- git config branch.master.merge refs/heads/one &&
49
+ git config branch.main.remote two &&
50
+ git config branch.main.merge refs/heads/one &&
51
mkdir -p .git/remotes &&
52
{
53
echo "URL: ../two/.git/"
52
- echo "Pull: refs/heads/master:refs/heads/two"
54
+ echo "Pull: refs/heads/main:refs/heads/two"
55
echo "Pull: refs/heads/one:refs/heads/one"
56
} >.git/remotes/two
57
) &&
@@ -65,7 +67,7 @@ test_expect_success "fetch test" '
67
git fetch &&
68
git rev-parse --verify refs/heads/one &&
69
mine=$(git rev-parse refs/heads/one) &&
68
- his=$(cd ../one && git rev-parse refs/heads/master) &&
70
+ his=$(cd ../one && git rev-parse refs/heads/main) &&
71
test "z$mine" = "z$his"
72
'
73
@@ -75,11 +77,11 @@ test_expect_success "fetch test for-merge" '
77
git fetch &&
78
git rev-parse --verify refs/heads/two &&
79
git rev-parse --verify refs/heads/one &&
78
- master_in_two=$(cd ../two && git rev-parse master) &&
80
+ main_in_two=$(cd ../two && git rev-parse main) &&
81
one_in_two=$(cd ../two && git rev-parse one) &&
82
{
83
echo "$one_in_two "
82
- echo "$master_in_two not-for-merge"
84
+ echo "$main_in_two not-for-merge"
85
} >expected &&
86
cut -f -2 .git/FETCH_HEAD >actual &&
87
test_cmp expected actual'
@@ -88,7 +90,7 @@ test_expect_success 'fetch --prune on its own works as expected' '
90
cd "$D" &&
91
git clone . prune &&
92
cd prune &&
91
- git update-ref refs/remotes/origin/extrabranch master &&
93
+ git update-ref refs/remotes/origin/extrabranch main &&
94
95
git fetch --prune origin &&
96
test_must_fail git rev-parse origin/extrabranch
@@ -98,9 +100,9 @@ test_expect_success 'fetch --prune with a branch name keeps branches' '
100
cd "$D" &&
101
git clone . prune-branch &&
102
cd prune-branch &&
101
- git update-ref refs/remotes/origin/extrabranch master &&
103
+ git update-ref refs/remotes/origin/extrabranch main &&
104
103
- git fetch --prune origin master &&
105
+ git fetch --prune origin main &&
106
git rev-parse origin/extrabranch
107
'
108
@@ -110,18 +112,18 @@ test_expect_success 'fetch --prune with a namespace keeps other namespaces' '
112
cd prune-namespace &&
113
114
git fetch --prune origin refs/heads/a/*:refs/remotes/origin/a/* &&
113
- git rev-parse origin/master
115
+ git rev-parse origin/main
116
'
117
118
test_expect_success 'fetch --prune handles overlapping refspecs' '
119
cd "$D" &&
118
- git update-ref refs/pull/42/head master &&
120
+ git update-ref refs/pull/42/head main &&
121
git clone . prune-overlapping &&
122
cd prune-overlapping &&
123
git config --add remote.origin.fetch refs/pull/*/head:refs/remotes/origin/pr/* &&
124
125
git fetch --prune origin &&
124
- git rev-parse origin/master &&
126
+ git rev-parse origin/main &&
127
git rev-parse origin/pr/42 &&
128
129
git config --unset-all remote.origin.fetch &&
@@ -129,7 +131,7 @@ test_expect_success 'fetch --prune handles overlapping refspecs' '
131
git config --add remote.origin.fetch refs/heads/*:refs/remotes/origin/* &&
132
133
git fetch --prune origin &&
132
- git rev-parse origin/master &&
134
+ git rev-parse origin/main &&
135
git rev-parse origin/pr/42
136
'
137
@@ -137,13 +139,13 @@ test_expect_success 'fetch --prune --tags prunes branches but not tags' '
139
cd "$D" &&
140
git clone . prune-tags &&
141
cd prune-tags &&
140
- git tag sometag master &&
142
+ git tag sometag main &&
143
# Create what looks like a remote-tracking branch from an earlier
144
# fetch that has since been deleted from the remote:
143
- git update-ref refs/remotes/origin/fake-remote master &&
145
+ git update-ref refs/remotes/origin/fake-remote main &&
146
147
git fetch --prune --tags origin &&
146
- git rev-parse origin/master &&
148
+ git rev-parse origin/main &&
149
test_must_fail git rev-parse origin/fake-remote &&
150
git rev-parse sometag
151
'
@@ -152,10 +154,10 @@ test_expect_success 'fetch --prune --tags with branch does not prune other thing
154
cd "$D" &&
155
git clone . prune-tags-branch &&
156
cd prune-tags-branch &&
155
- git tag sometag master &&
156
- git update-ref refs/remotes/origin/extrabranch master &&
157
+ git tag sometag main &&
158
+ git update-ref refs/remotes/origin/extrabranch main &&
159
158
- git fetch --prune --tags origin master &&
160
+ git fetch --prune --tags origin main &&
161
git rev-parse origin/extrabranch &&
162
git rev-parse sometag
163
'
@@ -164,9 +166,9 @@ test_expect_success 'fetch --prune --tags with refspec prunes based on refspec'
166
cd "$D" &&
167
git clone . prune-tags-refspec &&
168
cd prune-tags-refspec &&
167
- git tag sometag master &&
168
- git update-ref refs/remotes/origin/foo/otherbranch master &&
169
- git update-ref refs/remotes/origin/extrabranch master &&
169
+ git tag sometag main &&
170
+ git update-ref refs/remotes/origin/foo/otherbranch main &&
171
+ git update-ref refs/remotes/origin/extrabranch main &&
172
173
git fetch --prune --tags origin refs/heads/foo/*:refs/remotes/origin/foo/* &&
174
test_must_fail git rev-parse refs/remotes/origin/foo/otherbranch &&
@@ -177,20 +179,20 @@ test_expect_success 'fetch --prune --tags with refspec prunes based on refspec'
179
test_expect_success '--refmap="" ignores configured refspec' '
180
cd "$TRASH_DIRECTORY" &&
181
git clone "$D" remote-refs &&
180
- git -C remote-refs rev-parse remotes/origin/master >old &&
181
- git -C remote-refs update-ref refs/remotes/origin/master master~1 &&
182
- git -C remote-refs rev-parse remotes/origin/master >new &&
182
+ git -C remote-refs rev-parse remotes/origin/main >old &&
183
+ git -C remote-refs update-ref refs/remotes/origin/main main~1 &&
184
+ git -C remote-refs rev-parse remotes/origin/main >new &&
185
git -C remote-refs fetch --refmap= origin "+refs/heads/*:refs/hidden/origin/*" &&
184
- git -C remote-refs rev-parse remotes/origin/master >actual &&
186
+ git -C remote-refs rev-parse remotes/origin/main >actual &&
187
test_cmp new actual &&
188
git -C remote-refs fetch origin &&
187
- git -C remote-refs rev-parse remotes/origin/master >actual &&
189
+ git -C remote-refs rev-parse remotes/origin/main >actual &&
190
test_cmp old actual
191
'
192
193
test_expect_success '--refmap="" and --prune' '
192
- git -C remote-refs update-ref refs/remotes/origin/foo/otherbranch master &&
193
- git -C remote-refs update-ref refs/hidden/foo/otherbranch master &&
194
+ git -C remote-refs update-ref refs/remotes/origin/foo/otherbranch main &&
195
+ git -C remote-refs update-ref refs/hidden/foo/otherbranch main &&
196
git -C remote-refs fetch --prune --refmap="" origin +refs/heads/*:refs/hidden/* &&
197
git -C remote-refs rev-parse remotes/origin/foo/otherbranch &&
198
test_must_fail git -C remote-refs rev-parse refs/hidden/foo/otherbranch &&
@@ -250,7 +252,7 @@ test_expect_success 'fetch uses remote ref names to describe new refs' '
252
test_i18ngrep "new tag.* -> descriptive-tag$" actual &&
253
test_i18ngrep "new ref.* -> crazy$" actual
254
) &&
253
- git checkout master
255
+ git checkout main
256
'
257
258
test_expect_success 'fetch must not resolve short tag name' '
@@ -281,7 +283,7 @@ test_expect_success 'create bundle 1' '
283
cd "$D" &&
284
echo >file updated again by origin &&
285
git commit -a -m "tip" &&
284
- git bundle create --version=3 bundle1 master^..master
286
+ git bundle create --version=3 bundle1 main^..main
287
'
288
289
test_expect_success 'header of bundle looks right' '
@@ -289,7 +291,7 @@ test_expect_success 'header of bundle looks right' '
291
# v3 git bundle
292
@object-format=$(test_oid algo)
293
-OID updated by origin
292
- OID refs/heads/master
294
+ OID refs/heads/main
295
296
EOF
297
sed -e "s/$OID_REGEX/OID/g" -e "5q" "$D"/bundle1 >actual &&
@@ -298,13 +300,13 @@ test_expect_success 'header of bundle looks right' '
300
301
test_expect_success 'create bundle 2' '
302
cd "$D" &&
301
- git bundle create bundle2 master~2..master
303
+ git bundle create bundle2 main~2..main
304
'
305
306
test_expect_success 'unbundle 1' '
307
cd "$D/bundle" &&
308
git checkout -b some-branch &&
307
- test_must_fail git fetch "$D/bundle1" master:master
309
+ test_must_fail git fetch "$D/bundle1" main:main
310
'
311
312
@@ -317,8 +319,8 @@ test_expect_success 'bundle 1 has only 3 files ' '
319
320
test_expect_success 'unbundle 2' '
321
cd "$D/bundle" &&
320
- git fetch ../bundle2 master:master &&
321
- test "tip" = "$(git log -1 --pretty=oneline master | cut -d" " -f2)"
322
+ git fetch ../bundle2 main:main &&
323
+ test "tip" = "$(git log -1 --pretty=oneline main | cut -d" " -f2)"
324
'
325
326
test_expect_success 'bundle does not prerequisite objects' '
@@ -335,14 +337,14 @@ test_expect_success 'bundle does not prerequisite objects' '
337
test_expect_success 'bundle should be able to create a full history' '
338
339
cd "$D" &&
338
- git tag -a -m "1.0" v1.0 master &&
340
+ git tag -a -m "1.0" v1.0 main &&
341
git bundle create bundle4 v1.0
342
343
'
344
345
test_expect_success 'fetch with a non-applying branch.<name>.merge' '
344
- git config branch.master.remote yeti &&
345
- git config branch.master.merge refs/heads/bigfoot &&
346
+ git config branch.main.remote yeti &&
347
+ git config branch.main.merge refs/heads/bigfoot &&
348
git config remote.blub.url one &&
349
git config remote.blub.fetch "refs/heads/*:refs/remotes/one/*" &&
350
git fetch blub
@@ -362,8 +364,8 @@ test_expect_success 'fetch from GIT URL with a non-applying branch.<name>.merge
364
# the merge spec matches the branch the remote HEAD points to
365
test_expect_success 'fetch from GIT URL with a non-applying branch.<name>.merge [2]' '
366
one_ref=$(cd one && git symbolic-ref HEAD) &&
365
- git config branch.master.remote blub &&
366
- git config branch.master.merge "$one_ref" &&
367
+ git config branch.main.remote blub &&
368
+ git config branch.main.merge "$one_ref" &&
369
git update-ref -d FETCH_HEAD &&
370
git fetch one &&
371
test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
@@ -373,7 +375,7 @@ test_expect_success 'fetch from GIT URL with a non-applying branch.<name>.merge
375
# URL supplied to fetch matches the url of the configured branch's remote, but
376
# the merge spec does not match the branch the remote HEAD points to
377
test_expect_success 'fetch from GIT URL with a non-applying branch.<name>.merge [3]' '
376
- git config branch.master.merge "${one_ref}_not" &&
378
+ git config branch.main.merge "${one_ref}_not" &&
379
git update-ref -d FETCH_HEAD &&
380
git fetch one &&
381
test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
@@ -389,9 +391,9 @@ test_expect_success 'quoting of a strangely named repo' '
391
test_expect_success 'bundle should record HEAD correctly' '
392
393
cd "$D" &&
392
- git bundle create bundle5 HEAD master &&
394
+ git bundle create bundle5 HEAD main &&
395
git bundle list-heads bundle5 >actual &&
394
- for h in HEAD refs/heads/master
396
+ for h in HEAD refs/heads/main
397
do
398
echo "$(git rev-parse --verify $h) $h"
399
done >expect &&
@@ -399,10 +401,10 @@ test_expect_success 'bundle should record HEAD correctly' '
401
402
'
403
402
-test_expect_success 'mark initial state of origin/master' '
404
+test_expect_success 'mark initial state of origin/main' '
405
(
406
cd three &&
405
- git tag base-origin-master refs/remotes/origin/master
407
+ git tag base-origin-main refs/remotes/origin/main
408
)
409
'
410
@@ -412,10 +414,10 @@ test_expect_success 'explicit fetch should update tracking' '
414
git branch -f side &&
415
(
416
cd three &&
415
- git update-ref refs/remotes/origin/master base-origin-master &&
416
- o=$(git rev-parse --verify refs/remotes/origin/master) &&
417
- git fetch origin master &&
418
- n=$(git rev-parse --verify refs/remotes/origin/master) &&
417
+ git update-ref refs/remotes/origin/main base-origin-main &&
418
+ o=$(git rev-parse --verify refs/remotes/origin/main) &&
419
+ git fetch origin main &&
420
+ n=$(git rev-parse --verify refs/remotes/origin/main) &&
421
test "$o" != "$n" &&
422
test_must_fail git rev-parse --verify refs/remotes/origin/side
423
)
@@ -427,10 +429,10 @@ test_expect_success 'explicit pull should update tracking' '
429
git branch -f side &&
430
(
431
cd three &&
430
- git update-ref refs/remotes/origin/master base-origin-master &&
431
- o=$(git rev-parse --verify refs/remotes/origin/master) &&
432
- git pull origin master &&
433
- n=$(git rev-parse --verify refs/remotes/origin/master) &&
432
+ git update-ref refs/remotes/origin/main base-origin-main &&
433
+ o=$(git rev-parse --verify refs/remotes/origin/main) &&
434
+ git pull origin main &&
435
+ n=$(git rev-parse --verify refs/remotes/origin/main) &&
436
test "$o" != "$n" &&
437
test_must_fail git rev-parse --verify refs/remotes/origin/side
438
)
@@ -449,13 +451,13 @@ test_expect_success 'explicit --refmap option overrides remote.*.fetch' '
451
git branch -f side &&
452
(
453
cd three &&
452
- git update-ref refs/remotes/origin/master base-origin-master &&
453
- o=$(git rev-parse --verify refs/remotes/origin/master) &&
454
- git fetch --refmap="refs/heads/*:refs/remotes/other/*" origin master &&
455
- n=$(git rev-parse --verify refs/remotes/origin/master) &&
454
+ git update-ref refs/remotes/origin/main base-origin-main &&
455
+ o=$(git rev-parse --verify refs/remotes/origin/main) &&
456
+ git fetch --refmap="refs/heads/*:refs/remotes/other/*" origin main &&
457
+ n=$(git rev-parse --verify refs/remotes/origin/main) &&
458
test "$o" = "$n" &&
459
test_must_fail git rev-parse --verify refs/remotes/origin/side &&
458
- git rev-parse --verify refs/remotes/other/master
460
+ git rev-parse --verify refs/remotes/other/main
461
)
462
'
463
@@ -464,10 +466,10 @@ test_expect_success 'explicitly empty --refmap option disables remote.*.fetch' '
466
git branch -f side &&
467
(
468
cd three &&
467
- git update-ref refs/remotes/origin/master base-origin-master &&
468
- o=$(git rev-parse --verify refs/remotes/origin/master) &&
469
- git fetch --refmap="" origin master &&
470
- n=$(git rev-parse --verify refs/remotes/origin/master) &&
469
+ git update-ref refs/remotes/origin/main base-origin-main &&
470
+ o=$(git rev-parse --verify refs/remotes/origin/main) &&
471
+ git fetch --refmap="" origin main &&
472
+ n=$(git rev-parse --verify refs/remotes/origin/main) &&
473
test "$o" = "$n" &&
474
test_must_fail git rev-parse --verify refs/remotes/origin/side
475
)
@@ -479,10 +481,10 @@ test_expect_success 'configured fetch updates tracking' '
481
git branch -f side &&
482
(
483
cd three &&
482
- git update-ref refs/remotes/origin/master base-origin-master &&
483
- o=$(git rev-parse --verify refs/remotes/origin/master) &&
484
+ git update-ref refs/remotes/origin/main base-origin-main &&
485
+ o=$(git rev-parse --verify refs/remotes/origin/main) &&
486
git fetch origin &&
485
- n=$(git rev-parse --verify refs/remotes/origin/master) &&
487
+ n=$(git rev-parse --verify refs/remotes/origin/main) &&
488
test "$o" != "$n" &&
489
git rev-parse --verify refs/remotes/origin/side
490
)
@@ -493,12 +495,12 @@ test_expect_success 'non-matching refspecs do not confuse tracking update' '
495
git update-ref refs/odd/location HEAD &&
496
(
497
cd three &&
496
- git update-ref refs/remotes/origin/master base-origin-master &&
498
+ git update-ref refs/remotes/origin/main base-origin-main &&
499
git config --add remote.origin.fetch \
500
refs/odd/location:refs/remotes/origin/odd &&
499
- o=$(git rev-parse --verify refs/remotes/origin/master) &&
500
- git fetch origin master &&
501
- n=$(git rev-parse --verify refs/remotes/origin/master) &&
501
+ o=$(git rev-parse --verify refs/remotes/origin/main) &&
502
+ git fetch origin main &&
503
+ n=$(git rev-parse --verify refs/remotes/origin/main) &&
504
test "$o" != "$n" &&
505
test_must_fail git rev-parse --verify refs/remotes/origin/odd
506
)
@@ -524,7 +526,7 @@ test_expect_success 'auto tag following fetches minimum' '
526
git tag -a -m $i excess-$i || exit 1
527
done
528
) &&
527
- git checkout master &&
529
+ git checkout main &&
530
(
531
cd follow &&
532
git fetch
@@ -533,13 +535,13 @@ test_expect_success 'auto tag following fetches minimum' '
535
536
test_expect_success 'refuse to fetch into the current branch' '
537
536
- test_must_fail git fetch . side:master
538
+ test_must_fail git fetch . side:main
539
540
'
541
542
test_expect_success 'fetch into the current branch with --update-head-ok' '
543
542
- git fetch --update-head-ok . side:master
544
+ git fetch --update-head-ok . side:main
545
546
'
547
@@ -568,7 +570,7 @@ test_expect_success "should be able to fetch with duplicate refspecs" '
570
(
571
cd dups &&
572
git init &&
571
- git config branch.master.remote three &&
573
+ git config branch.main.remote three &&
574
git config remote.three.url ../three/.git &&
575
git config remote.three.fetch +refs/heads/*:refs/remotes/origin/* &&
576
git config --add remote.three.fetch +refs/heads/*:refs/remotes/origin/* &&
@@ -877,11 +879,11 @@ test_expect_success 'all boundary commits are excluded' '
879
test_commit oneside &&
880
git checkout HEAD^ &&
881
test_commit otherside &&
880
- git checkout master &&
882
+ git checkout main &&
883
test_tick &&
884
git merge otherside &&
885
ad=$(git log --no-walk --format=%ad HEAD) &&
884
- git bundle create twoside-boundary.bdl master --since="$ad" &&
886
+ git bundle create twoside-boundary.bdl main --since="$ad" &&
887
convert_bundle_to_pack <twoside-boundary.bdl >twoside-boundary.pack &&
888
pack=$(git index-pack --fix-thin --stdin <twoside-boundary.pack) &&
889
test_bundle_object_count .git/objects/pack/pack-${pack##pack }.pack 3
@@ -942,7 +944,7 @@ test_expect_success 'fetching with auto-gc does not lock up' '
944
)
945
'
946
945
-test_expect_success PREPARE_FOR_MAIN_BRANCH,C_LOCALE_OUTPUT 'fetch aligned output' '
947
+test_expect_success C_LOCALE_OUTPUT 'fetch aligned output' '
948
git clone . full-output &&
949
test_commit looooooooooooong-tag &&
950
(
@@ -957,7 +959,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH,C_LOCALE_OUTPUT 'fetch aligned outpu
959
test_cmp expect actual
960
'
961
960
-test_expect_success PREPARE_FOR_MAIN_BRANCH,C_LOCALE_OUTPUT 'fetch compact output' '
962
+test_expect_success C_LOCALE_OUTPUT 'fetch compact output' '
963
git clone . compact &&
964
test_commit extraaa &&
965
(
@@ -1001,7 +1003,7 @@ setup_negotiation_tip () {
1003
USE_PROTOCOL_V2="$3"
1004
1005
rm -rf "$SERVER" client trace &&
1004
- git init "$SERVER" &&
1006
+ git init -b main "$SERVER" &&
1007
test_commit -C "$SERVER" alpha_1 &&
1008
test_commit -C "$SERVER" alpha_2 &&
1009
git -C "$SERVER" checkout --orphan beta &&
@@ -1017,7 +1019,7 @@ setup_negotiation_tip () {
1019
fi &&
1020
1021
test_commit -C "$SERVER" beta_s &&
1020
- git -C "$SERVER" checkout master &&
1022
+ git -C "$SERVER" checkout main &&
1023
test_commit -C "$SERVER" alpha_s &&
1024
git -C "$SERVER" tag -d alpha_1 alpha_2 beta_1 beta_2
1025
}