Skip to content

Commit 3fc7fc1

Browse files
gitstergitster
committed
Merge branch 'js/t5526-with-no-particular-primary-branch-name'
Test update. * js/t5526-with-no-particular-primary-branch-name: t5526: drop the prereq expecting the default branch name `main` t5526: avoid depending on a specific default branch name
2 parents 043bfc6 + 71f4a93 commit 3fc7fc1

File tree

1 file changed

+43
-40
lines changed

1 file changed

+43
-40
lines changed

‎t/t5526-fetch-submodules.sh‎

Lines changed: 43 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ add_upstream_commit() {
1818
head2=$(git rev-parse --short HEAD) &&
1919
echo "Fetching submodule submodule" > ../expect.err &&
2020
echo "From $pwd/submodule" >> ../expect.err &&
21-
echo " $head1..$head2 main -> origin/main" >> ../expect.err
21+
echo " $head1..$head2 sub -> origin/sub" >> ../expect.err
2222
) &&
2323
(
2424
cd deepsubmodule &&
@@ -30,7 +30,7 @@ add_upstream_commit() {
3030
head2=$(git rev-parse --short HEAD) &&
3131
echo "Fetching submodule submodule/subdir/deepsubmodule" >> ../expect.err
3232
echo "From $pwd/deepsubmodule" >> ../expect.err &&
33-
echo " $head1..$head2 main -> origin/main" >> ../expect.err
33+
echo " $head1..$head2 deep -> origin/deep" >> ../expect.err
3434
)
3535
}
3636

@@ -41,7 +41,8 @@ test_expect_success setup '
4141
git init &&
4242
echo deepsubcontent > deepsubfile &&
4343
git add deepsubfile &&
44-
git commit -m new deepsubfile
44+
git commit -m new deepsubfile &&
45+
git branch -M deep
4546
) &&
4647
mkdir submodule &&
4748
(
@@ -50,18 +51,20 @@ test_expect_success setup '
5051
echo subcontent > subfile &&
5152
git add subfile &&
5253
git submodule add "$pwd/deepsubmodule" subdir/deepsubmodule &&
53-
git commit -a -m new
54+
git commit -a -m new &&
55+
git branch -M sub
5456
) &&
5557
git submodule add "$pwd/submodule" submodule &&
5658
git commit -am initial &&
59+
git branch -M super &&
5760
git clone . downstream &&
5861
(
5962
cd downstream &&
6063
git submodule update --init --recursive
6164
)
6265
'
6366

64-
test_expect_success PREPARE_FOR_MAIN_BRANCH "fetch --recurse-submodules recurses into submodules" '
67+
test_expect_success "fetch --recurse-submodules recurses into submodules" '
6568
add_upstream_commit &&
6669
(
6770
cd downstream &&
@@ -71,7 +74,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH "fetch --recurse-submodules recurses
7174
test_i18ncmp expect.err actual.err
7275
'
7376

74-
test_expect_success PREPARE_FOR_MAIN_BRANCH "submodule.recurse option triggers recursive fetch" '
77+
test_expect_success "submodule.recurse option triggers recursive fetch" '
7578
add_upstream_commit &&
7679
(
7780
cd downstream &&
@@ -81,7 +84,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH "submodule.recurse option triggers r
8184
test_i18ncmp expect.err actual.err
8285
'
8386

84-
test_expect_success PREPARE_FOR_MAIN_BRANCH "fetch --recurse-submodules -j2 has the same output behaviour" '
87+
test_expect_success "fetch --recurse-submodules -j2 has the same output behaviour" '
8588
add_upstream_commit &&
8689
(
8790
cd downstream &&
@@ -111,7 +114,7 @@ test_expect_success "fetch --no-recurse-submodules only fetches superproject" '
111114
test_must_be_empty actual.err
112115
'
113116

114-
test_expect_success PREPARE_FOR_MAIN_BRANCH "using fetchRecurseSubmodules=true in .gitmodules recurses into submodules" '
117+
test_expect_success "using fetchRecurseSubmodules=true in .gitmodules recurses into submodules" '
115118
(
116119
cd downstream &&
117120
git config -f .gitmodules submodule.submodule.fetchRecurseSubmodules true &&
@@ -141,7 +144,7 @@ test_expect_success "using fetchRecurseSubmodules=false in .git/config overrides
141144
test_must_be_empty actual.err
142145
'
143146

144-
test_expect_success PREPARE_FOR_MAIN_BRANCH "--recurse-submodules overrides fetchRecurseSubmodules setting from .git/config" '
147+
test_expect_success "--recurse-submodules overrides fetchRecurseSubmodules setting from .git/config" '
145148
(
146149
cd downstream &&
147150
git fetch --recurse-submodules >../actual.out 2>../actual.err &&
@@ -170,7 +173,7 @@ test_expect_success "--quiet propagates to parallel submodules" '
170173
test_must_be_empty actual.err
171174
'
172175

173-
test_expect_success PREPARE_FOR_MAIN_BRANCH "--dry-run propagates to submodules" '
176+
test_expect_success "--dry-run propagates to submodules" '
174177
add_upstream_commit &&
175178
(
176179
cd downstream &&
@@ -180,7 +183,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH "--dry-run propagates to submodules"
180183
test_i18ncmp expect.err actual.err
181184
'
182185

183-
test_expect_success PREPARE_FOR_MAIN_BRANCH "Without --dry-run propagates to submodules" '
186+
test_expect_success "Without --dry-run propagates to submodules" '
184187
(
185188
cd downstream &&
186189
git fetch --recurse-submodules >../actual.out 2>../actual.err
@@ -189,7 +192,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH "Without --dry-run propagates to sub
189192
test_i18ncmp expect.err actual.err
190193
'
191194

192-
test_expect_success PREPARE_FOR_MAIN_BRANCH "recurseSubmodules=true propagates into submodules" '
195+
test_expect_success "recurseSubmodules=true propagates into submodules" '
193196
add_upstream_commit &&
194197
(
195198
cd downstream &&
@@ -200,7 +203,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH "recurseSubmodules=true propagates i
200203
test_i18ncmp expect.err actual.err
201204
'
202205

203-
test_expect_success PREPARE_FOR_MAIN_BRANCH "--recurse-submodules overrides config in submodule" '
206+
test_expect_success "--recurse-submodules overrides config in submodule" '
204207
add_upstream_commit &&
205208
(
206209
cd downstream &&
@@ -225,7 +228,7 @@ test_expect_success "--no-recurse-submodules overrides config setting" '
225228
test_must_be_empty actual.err
226229
'
227230

228-
test_expect_success PREPARE_FOR_MAIN_BRANCH "Recursion doesn't happen when no new commits are fetched in the superproject" '
231+
test_expect_success "Recursion doesn't happen when no new commits are fetched in the superproject" '
229232
(
230233
cd downstream &&
231234
(
@@ -239,13 +242,13 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH "Recursion doesn't happen when no ne
239242
test_must_be_empty actual.err
240243
'
241244

242-
test_expect_success PREPARE_FOR_MAIN_BRANCH "Recursion stops when no new submodule commits are fetched" '
245+
test_expect_success "Recursion stops when no new submodule commits are fetched" '
243246
head1=$(git rev-parse --short HEAD) &&
244247
git add submodule &&
245248
git commit -m "new submodule" &&
246249
head2=$(git rev-parse --short HEAD) &&
247250
echo "From $pwd/." > expect.err.sub &&
248-
echo " $head1..$head2 main -> origin/main" >>expect.err.sub &&
251+
echo " $head1..$head2 super -> origin/super" >>expect.err.sub &&
249252
head -3 expect.err >> expect.err.sub &&
250253
(
251254
cd downstream &&
@@ -255,15 +258,15 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH "Recursion stops when no new submodu
255258
test_must_be_empty actual.out
256259
'
257260

258-
test_expect_success PREPARE_FOR_MAIN_BRANCH "Recursion doesn't happen when new superproject commits don't change any submodules" '
261+
test_expect_success "Recursion doesn't happen when new superproject commits don't change any submodules" '
259262
add_upstream_commit &&
260263
head1=$(git rev-parse --short HEAD) &&
261264
echo a > file &&
262265
git add file &&
263266
git commit -m "new file" &&
264267
head2=$(git rev-parse --short HEAD) &&
265268
echo "From $pwd/." > expect.err.file &&
266-
echo " $head1..$head2 main -> origin/main" >> expect.err.file &&
269+
echo " $head1..$head2 super -> origin/super" >> expect.err.file &&
267270
(
268271
cd downstream &&
269272
git fetch >../actual.out 2>../actual.err
@@ -272,7 +275,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH "Recursion doesn't happen when new s
272275
test_i18ncmp expect.err.file actual.err
273276
'
274277

275-
test_expect_success PREPARE_FOR_MAIN_BRANCH "Recursion picks up config in submodule" '
278+
test_expect_success "Recursion picks up config in submodule" '
276279
(
277280
cd downstream &&
278281
git fetch --recurse-submodules &&
@@ -287,7 +290,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH "Recursion picks up config in submod
287290
git commit -m "new submodule" &&
288291
head2=$(git rev-parse --short HEAD) &&
289292
echo "From $pwd/." > expect.err.sub &&
290-
echo " $head1..$head2 main -> origin/main" >> expect.err.sub &&
293+
echo " $head1..$head2 super -> origin/super" >> expect.err.sub &&
291294
cat expect.err >> expect.err.sub &&
292295
(
293296
cd downstream &&
@@ -301,7 +304,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH "Recursion picks up config in submod
301304
test_must_be_empty actual.out
302305
'
303306

304-
test_expect_success PREPARE_FOR_MAIN_BRANCH "Recursion picks up all submodules when necessary" '
307+
test_expect_success "Recursion picks up all submodules when necessary" '
305308
add_upstream_commit &&
306309
(
307310
cd submodule &&
@@ -316,14 +319,14 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH "Recursion picks up all submodules w
316319
head2=$(git rev-parse --short HEAD) &&
317320
echo "Fetching submodule submodule" > ../expect.err.sub &&
318321
echo "From $pwd/submodule" >> ../expect.err.sub &&
319-
echo " $head1..$head2 main -> origin/main" >> ../expect.err.sub
322+
echo " $head1..$head2 sub -> origin/sub" >> ../expect.err.sub
320323
) &&
321324
head1=$(git rev-parse --short HEAD) &&
322325
git add submodule &&
323326
git commit -m "new submodule" &&
324327
head2=$(git rev-parse --short HEAD) &&
325328
echo "From $pwd/." > expect.err.2 &&
326-
echo " $head1..$head2 main -> origin/main" >> expect.err.2 &&
329+
echo " $head1..$head2 super -> origin/super" >> expect.err.2 &&
327330
cat expect.err.sub >> expect.err.2 &&
328331
tail -3 expect.err >> expect.err.2 &&
329332
(
@@ -334,7 +337,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH "Recursion picks up all submodules w
334337
test_must_be_empty actual.out
335338
'
336339

337-
test_expect_success PREPARE_FOR_MAIN_BRANCH "'--recurse-submodules=on-demand' doesn't recurse when no new commits are fetched in the superproject (and ignores config)" '
340+
test_expect_success "'--recurse-submodules=on-demand' doesn't recurse when no new commits are fetched in the superproject (and ignores config)" '
338341
add_upstream_commit &&
339342
(
340343
cd submodule &&
@@ -349,7 +352,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH "'--recurse-submodules=on-demand' do
349352
head2=$(git rev-parse --short HEAD) &&
350353
echo Fetching submodule submodule > ../expect.err.sub &&
351354
echo "From $pwd/submodule" >> ../expect.err.sub &&
352-
echo " $head1..$head2 main -> origin/main" >> ../expect.err.sub
355+
echo " $head1..$head2 sub -> origin/sub" >> ../expect.err.sub
353356
) &&
354357
(
355358
cd downstream &&
@@ -361,14 +364,14 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH "'--recurse-submodules=on-demand' do
361364
test_must_be_empty actual.err
362365
'
363366

364-
test_expect_success PREPARE_FOR_MAIN_BRANCH "'--recurse-submodules=on-demand' recurses as deep as necessary (and ignores config)" '
367+
test_expect_success "'--recurse-submodules=on-demand' recurses as deep as necessary (and ignores config)" '
365368
head1=$(git rev-parse --short HEAD) &&
366369
git add submodule &&
367370
git commit -m "new submodule" &&
368371
head2=$(git rev-parse --short HEAD) &&
369372
tail -3 expect.err > expect.err.deepsub &&
370373
echo "From $pwd/." > expect.err &&
371-
echo " $head1..$head2 main -> origin/main" >>expect.err &&
374+
echo " $head1..$head2 super -> origin/super" >>expect.err &&
372375
cat expect.err.sub >> expect.err &&
373376
cat expect.err.deepsub >> expect.err &&
374377
(
@@ -389,15 +392,15 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH "'--recurse-submodules=on-demand' re
389392
test_i18ncmp expect.err actual.err
390393
'
391394

392-
test_expect_success PREPARE_FOR_MAIN_BRANCH "'--recurse-submodules=on-demand' stops when no new submodule commits are found in the superproject (and ignores config)" '
395+
test_expect_success "'--recurse-submodules=on-demand' stops when no new submodule commits are found in the superproject (and ignores config)" '
393396
add_upstream_commit &&
394397
head1=$(git rev-parse --short HEAD) &&
395398
echo a >> file &&
396399
git add file &&
397400
git commit -m "new file" &&
398401
head2=$(git rev-parse --short HEAD) &&
399402
echo "From $pwd/." > expect.err.file &&
400-
echo " $head1..$head2 main -> origin/main" >> expect.err.file &&
403+
echo " $head1..$head2 super -> origin/super" >> expect.err.file &&
401404
(
402405
cd downstream &&
403406
git fetch --recurse-submodules=on-demand >../actual.out 2>../actual.err
@@ -406,7 +409,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH "'--recurse-submodules=on-demand' st
406409
test_i18ncmp expect.err.file actual.err
407410
'
408411

409-
test_expect_success PREPARE_FOR_MAIN_BRANCH "'fetch.recurseSubmodules=on-demand' overrides global config" '
412+
test_expect_success "'fetch.recurseSubmodules=on-demand' overrides global config" '
410413
(
411414
cd downstream &&
412415
git fetch --recurse-submodules
@@ -418,7 +421,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH "'fetch.recurseSubmodules=on-demand'
418421
git commit -m "new submodule" &&
419422
head2=$(git rev-parse --short HEAD) &&
420423
echo "From $pwd/." > expect.err.2 &&
421-
echo " $head1..$head2 main -> origin/main" >>expect.err.2 &&
424+
echo " $head1..$head2 super -> origin/super" >>expect.err.2 &&
422425
head -3 expect.err >> expect.err.2 &&
423426
(
424427
cd downstream &&
@@ -434,7 +437,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH "'fetch.recurseSubmodules=on-demand'
434437
test_i18ncmp expect.err.2 actual.err
435438
'
436439

437-
test_expect_success PREPARE_FOR_MAIN_BRANCH "'submodule.<sub>.fetchRecurseSubmodules=on-demand' overrides fetch.recurseSubmodules" '
440+
test_expect_success "'submodule.<sub>.fetchRecurseSubmodules=on-demand' overrides fetch.recurseSubmodules" '
438441
(
439442
cd downstream &&
440443
git fetch --recurse-submodules
@@ -446,7 +449,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH "'submodule.<sub>.fetchRecurseSubmod
446449
git commit -m "new submodule" &&
447450
head2=$(git rev-parse --short HEAD) &&
448451
echo "From $pwd/." > expect.err.2 &&
449-
echo " $head1..$head2 main -> origin/main" >>expect.err.2 &&
452+
echo " $head1..$head2 super -> origin/super" >>expect.err.2 &&
450453
head -3 expect.err >> expect.err.2 &&
451454
(
452455
cd downstream &&
@@ -462,7 +465,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH "'submodule.<sub>.fetchRecurseSubmod
462465
test_i18ncmp expect.err.2 actual.err
463466
'
464467

465-
test_expect_success PREPARE_FOR_MAIN_BRANCH "don't fetch submodule when newly recorded commits are already present" '
468+
test_expect_success "don't fetch submodule when newly recorded commits are already present" '
466469
(
467470
cd submodule &&
468471
git checkout -q HEAD^^
@@ -472,7 +475,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH "don't fetch submodule when newly re
472475
git commit -m "submodule rewound" &&
473476
head2=$(git rev-parse --short HEAD) &&
474477
echo "From $pwd/." > expect.err &&
475-
echo " $head1..$head2 main -> origin/main" >> expect.err &&
478+
echo " $head1..$head2 super -> origin/super" >> expect.err &&
476479
(
477480
cd downstream &&
478481
git fetch >../actual.out 2>../actual.err
@@ -481,11 +484,11 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH "don't fetch submodule when newly re
481484
test_i18ncmp expect.err actual.err &&
482485
(
483486
cd submodule &&
484-
git checkout -q master
487+
git checkout -q sub
485488
)
486489
'
487490

488-
test_expect_success PREPARE_FOR_MAIN_BRANCH "'fetch.recurseSubmodules=on-demand' works also without .gitmodules entry" '
491+
test_expect_success "'fetch.recurseSubmodules=on-demand' works also without .gitmodules entry" '
489492
(
490493
cd downstream &&
491494
git fetch --recurse-submodules
@@ -497,7 +500,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH "'fetch.recurseSubmodules=on-demand'
497500
git commit -m "new submodule without .gitmodules" &&
498501
head2=$(git rev-parse --short HEAD) &&
499502
echo "From $pwd/." >expect.err.2 &&
500-
echo " $head1..$head2 main -> origin/main" >>expect.err.2 &&
503+
echo " $head1..$head2 super -> origin/super" >>expect.err.2 &&
501504
head -3 expect.err >>expect.err.2 &&
502505
(
503506
cd downstream &&
@@ -663,9 +666,9 @@ test_expect_success 'fetch new submodule commits on-demand without .gitmodules e
663666
git config -f .gitmodules --remove-section submodule.sub1 &&
664667
git add .gitmodules &&
665668
git commit -m "delete gitmodules file" &&
666-
git checkout -B master &&
669+
git checkout -B super &&
667670
git -C downstream fetch &&
668-
git -C downstream checkout origin/master &&
671+
git -C downstream checkout origin/super &&
669672
670673
C=$(git -C submodule commit-tree -m "yet another change outside refs/heads" HEAD^{tree}) &&
671674
git -C submodule update-ref refs/changes/7 $C &&

0 commit comments

Comments
 (0)