t5526: drop the prereq expecting the default branch name `main`
Initially, we started converting this test script in anticipation for renaming the default branch name to `main`. To that end, we partially converted it to accommodate for that default branch name, marking the now-failing test cases with a prereq that was designed to be fulfilled once the rename was complete. However, the effort to move to the branch name `main` needs quite a bit longer, as it was decided that we need a deprecation phase first. To avoid keeping t5526 in limbo for such a long time, we just made it independent of the actual default branch name used by Git. Therefore, that prereq is no longer necessary, and we can drop it. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Dec 4, 2020 at 14:34 UTC
71f4a9355a2742c071c7e9b3bce8b55b05867a0a
1 file changed
+21
-21
t/t5526-fetch-submodules.sh
+21
-21
@@ -64,7 +64,7 @@ test_expect_success setup '
64
)
65
'
66
67
-test_expect_success PREPARE_FOR_MAIN_BRANCH "fetch --recurse-submodules recurses into submodules" '
67
+test_expect_success "fetch --recurse-submodules recurses into submodules" '
68
add_upstream_commit &&
69
(
70
cd downstream &&
@@ -74,7 +74,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH "fetch --recurse-submodules recurses
74
test_i18ncmp expect.err actual.err
75
'
76
77
-test_expect_success PREPARE_FOR_MAIN_BRANCH "submodule.recurse option triggers recursive fetch" '
77
+test_expect_success "submodule.recurse option triggers recursive fetch" '
78
add_upstream_commit &&
79
(
80
cd downstream &&
@@ -84,7 +84,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH "submodule.recurse option triggers r
84
test_i18ncmp expect.err actual.err
85
'
86
87
-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" '
88
add_upstream_commit &&
89
(
90
cd downstream &&
@@ -114,7 +114,7 @@ test_expect_success "fetch --no-recurse-submodules only fetches superproject" '
114
test_must_be_empty actual.err
115
'
116
117
-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" '
118
(
119
cd downstream &&
120
git config -f .gitmodules submodule.submodule.fetchRecurseSubmodules true &&
@@ -144,7 +144,7 @@ test_expect_success "using fetchRecurseSubmodules=false in .git/config overrides
144
test_must_be_empty actual.err
145
'
146
147
-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" '
148
(
149
cd downstream &&
150
git fetch --recurse-submodules >../actual.out 2>../actual.err &&
@@ -173,7 +173,7 @@ test_expect_success "--quiet propagates to parallel submodules" '
173
test_must_be_empty actual.err
174
'
175
176
-test_expect_success PREPARE_FOR_MAIN_BRANCH "--dry-run propagates to submodules" '
176
+test_expect_success "--dry-run propagates to submodules" '
177
add_upstream_commit &&
178
(
179
cd downstream &&
@@ -183,7 +183,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH "--dry-run propagates to submodules"
183
test_i18ncmp expect.err actual.err
184
'
185
186
-test_expect_success PREPARE_FOR_MAIN_BRANCH "Without --dry-run propagates to submodules" '
186
+test_expect_success "Without --dry-run propagates to submodules" '
187
(
188
cd downstream &&
189
git fetch --recurse-submodules >../actual.out 2>../actual.err
@@ -192,7 +192,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH "Without --dry-run propagates to sub
192
test_i18ncmp expect.err actual.err
193
'
194
195
-test_expect_success PREPARE_FOR_MAIN_BRANCH "recurseSubmodules=true propagates into submodules" '
195
+test_expect_success "recurseSubmodules=true propagates into submodules" '
196
add_upstream_commit &&
197
(
198
cd downstream &&
@@ -203,7 +203,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH "recurseSubmodules=true propagates i
203
test_i18ncmp expect.err actual.err
204
'
205
206
-test_expect_success PREPARE_FOR_MAIN_BRANCH "--recurse-submodules overrides config in submodule" '
206
+test_expect_success "--recurse-submodules overrides config in submodule" '
207
add_upstream_commit &&
208
(
209
cd downstream &&
@@ -228,7 +228,7 @@ test_expect_success "--no-recurse-submodules overrides config setting" '
228
test_must_be_empty actual.err
229
'
230
231
-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" '
232
(
233
cd downstream &&
234
(
@@ -242,7 +242,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH "Recursion doesn't happen when no ne
242
test_must_be_empty actual.err
243
'
244
245
-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" '
246
head1=$(git rev-parse --short HEAD) &&
247
git add submodule &&
248
git commit -m "new submodule" &&
@@ -258,7 +258,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH "Recursion stops when no new submodu
258
test_must_be_empty actual.out
259
'
260
261
-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" '
262
add_upstream_commit &&
263
head1=$(git rev-parse --short HEAD) &&
264
echo a > file &&
@@ -275,7 +275,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH "Recursion doesn't happen when new s
275
test_i18ncmp expect.err.file actual.err
276
'
277
278
-test_expect_success PREPARE_FOR_MAIN_BRANCH "Recursion picks up config in submodule" '
278
+test_expect_success "Recursion picks up config in submodule" '
279
(
280
cd downstream &&
281
git fetch --recurse-submodules &&
@@ -304,7 +304,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH "Recursion picks up config in submod
304
test_must_be_empty actual.out
305
'
306
307
-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" '
308
add_upstream_commit &&
309
(
310
cd submodule &&
@@ -337,7 +337,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH "Recursion picks up all submodules w
337
test_must_be_empty actual.out
338
'
339
340
-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)" '
341
add_upstream_commit &&
342
(
343
cd submodule &&
@@ -364,7 +364,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH "'--recurse-submodules=on-demand' do
364
test_must_be_empty actual.err
365
'
366
367
-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)" '
368
head1=$(git rev-parse --short HEAD) &&
369
git add submodule &&
370
git commit -m "new submodule" &&
@@ -392,7 +392,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH "'--recurse-submodules=on-demand' re
392
test_i18ncmp expect.err actual.err
393
'
394
395
-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)" '
396
add_upstream_commit &&
397
head1=$(git rev-parse --short HEAD) &&
398
echo a >> file &&
@@ -409,7 +409,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH "'--recurse-submodules=on-demand' st
409
test_i18ncmp expect.err.file actual.err
410
'
411
412
-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" '
413
(
414
cd downstream &&
415
git fetch --recurse-submodules
@@ -437,7 +437,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH "'fetch.recurseSubmodules=on-demand'
437
test_i18ncmp expect.err.2 actual.err
438
'
439
440
-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" '
441
(
442
cd downstream &&
443
git fetch --recurse-submodules
@@ -465,7 +465,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH "'submodule.<sub>.fetchRecurseSubmod
465
test_i18ncmp expect.err.2 actual.err
466
'
467
468
-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" '
469
(
470
cd submodule &&
471
git checkout -q HEAD^^
@@ -488,7 +488,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH "don't fetch submodule when newly re
488
)
489
'
490
491
-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" '
492
(
493
cd downstream &&
494
git fetch --recurse-submodules