{"thread":{"id":"54760","subject":"[PATCH 0/2] Make t5526 independent of the default branch name","startedAt":"2020-12-04T14:35:08Z","lastAt":"2020-12-04T20:04:48Z","messageCount":4,"participants":["Johannes Schindelin via GitGitGadget","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"411327","messageId":"pull.806.git.1607092462.gitgitgadget@gmail.com","threadId":"54760","inReplyTo":null,"subject":"[PATCH 0/2] Make t5526 independent of the default branch name","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2020-12-04T14:34:20Z","receivedAt":"2020-12-04T14:35:08Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Quite a few test cases in t5526 were marked with the PREPARE_FOR_MAIN_BRANCH \nprerequisite, in preparation for changing the fall-back of \ninit.defaultBranch to main. However, in the meantime concerns were raised\nthat I moved too fast on this.\n\nAs a consequence, t5526 is largely inactive.\n\nThis patch series addresses that by overriding the initial branch names\nexplicitly in t5526, and then removing the no-longer-needed prerequisite.\nWith this, we have full test coverage in t5526 again, no matter how long the\neffort to rename the default branch name will take.\n\nJohannes Schindelin (2):\n  t5526: avoid depending on a specific default branch name\n  t5526: drop the prereq expecting the default branch name `main`\n\n t/t5526-fetch-submodules.sh | 83 +++++++++++++++++++------------------\n 1 file changed, 43 insertions(+), 40 deletions(-)\n\n\nbase-commit: fbc64c5ab5e1e73a56689d2270e7f27ab7cb29c1\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-806%2Fdscho%2Ft5526-and-the-default-branch-name-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-806/dscho/t5526-and-the-default-branch-name-v1\nPull-Request: https://github.com/gitgitgadget/git/pull/806\n-- \ngitgitgadget\n"},{"id":"411328","messageId":"f23d7ab8ac3500bcf0ac4a1e1dafd9c2ebf972b6.1607092462.git.gitgitgadget@gmail.com","threadId":"54760","inReplyTo":"pull.806.git.1607092462.gitgitgadget@gmail.com","subject":"[PATCH 1/2] t5526: avoid depending on a specific default branch name","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2020-12-04T14:34:21Z","receivedAt":"2020-12-04T14:35:09Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin <johannes.schindelin@gmx.de>\n\nWhile at it, use different default branch names for the three different\nrepositories involved in the test script: this makes it easier to debug\nfailures, too (otherwise you have to wonder which `master` branch was\nmeant: the super project's? The submodule's? The nested submodule's?).\n\nNote: this touches code that was originally modified to prepare for\nrenaming the default branch name to `main`. This patch side-steps that\neffort completely by overriding the initial branch name explicitly.\n\nSigned-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n---\n t/t5526-fetch-submodules.sh | 41 ++++++++++++++++++++-----------------\n 1 file changed, 22 insertions(+), 19 deletions(-)\n\ndiff --git a/t/t5526-fetch-submodules.sh b/t/t5526-fetch-submodules.sh\nindex dd8e423d25..6469120ded 100755\n--- a/t/t5526-fetch-submodules.sh\n+++ b/t/t5526-fetch-submodules.sh\n@@ -18,7 +18,7 @@ add_upstream_commit() {\n \t\thead2=$(git rev-parse --short HEAD) &&\n \t\techo \"Fetching submodule submodule\" > ../expect.err &&\n \t\techo \"From $pwd/submodule\" >> ../expect.err &&\n-\t\techo \"   $head1..$head2  main       -> origin/main\" >> ../expect.err\n+\t\techo \"   $head1..$head2  sub        -> origin/sub\" >> ../expect.err\n \t) &&\n \t(\n \t\tcd deepsubmodule &&\n@@ -30,7 +30,7 @@ add_upstream_commit() {\n \t\thead2=$(git rev-parse --short HEAD) &&\n \t\techo \"Fetching submodule submodule/subdir/deepsubmodule\" >> ../expect.err\n \t\techo \"From $pwd/deepsubmodule\" >> ../expect.err &&\n-\t\techo \"   $head1..$head2  main       -> origin/main\" >> ../expect.err\n+\t\techo \"   $head1..$head2  deep       -> origin/deep\" >> ../expect.err\n \t)\n }\n \n@@ -41,7 +41,8 @@ test_expect_success setup '\n \t\tgit init &&\n \t\techo deepsubcontent > deepsubfile &&\n \t\tgit add deepsubfile &&\n-\t\tgit commit -m new deepsubfile\n+\t\tgit commit -m new deepsubfile &&\n+\t\tgit branch -M deep\n \t) &&\n \tmkdir submodule &&\n \t(\n@@ -50,10 +51,12 @@ test_expect_success setup '\n \t\techo subcontent > subfile &&\n \t\tgit add subfile &&\n \t\tgit submodule add \"$pwd/deepsubmodule\" subdir/deepsubmodule &&\n-\t\tgit commit -a -m new\n+\t\tgit commit -a -m new &&\n+\t\tgit branch -M sub\n \t) &&\n \tgit submodule add \"$pwd/submodule\" submodule &&\n \tgit commit -am initial &&\n+\tgit branch -M super &&\n \tgit clone . downstream &&\n \t(\n \t\tcd downstream &&\n@@ -245,7 +248,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH \"Recursion stops when no new submodu\n \tgit commit -m \"new submodule\" &&\n \thead2=$(git rev-parse --short HEAD) &&\n \techo \"From $pwd/.\" > expect.err.sub &&\n-\techo \"   $head1..$head2  main       -> origin/main\" >>expect.err.sub &&\n+\techo \"   $head1..$head2  super      -> origin/super\" >>expect.err.sub &&\n \thead -3 expect.err >> expect.err.sub &&\n \t(\n \t\tcd downstream &&\n@@ -263,7 +266,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH \"Recursion doesn't happen when new s\n \tgit commit -m \"new file\" &&\n \thead2=$(git rev-parse --short HEAD) &&\n \techo \"From $pwd/.\" > expect.err.file &&\n-\techo \"   $head1..$head2  main       -> origin/main\" >> expect.err.file &&\n+\techo \"   $head1..$head2  super      -> origin/super\" >> expect.err.file &&\n \t(\n \t\tcd downstream &&\n \t\tgit fetch >../actual.out 2>../actual.err\n@@ -287,7 +290,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH \"Recursion picks up config in submod\n \tgit commit -m \"new submodule\" &&\n \thead2=$(git rev-parse --short HEAD) &&\n \techo \"From $pwd/.\" > expect.err.sub &&\n-\techo \"   $head1..$head2  main       -> origin/main\" >> expect.err.sub &&\n+\techo \"   $head1..$head2  super      -> origin/super\" >> expect.err.sub &&\n \tcat expect.err >> expect.err.sub &&\n \t(\n \t\tcd downstream &&\n@@ -316,14 +319,14 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH \"Recursion picks up all submodules w\n \t\thead2=$(git rev-parse --short HEAD) &&\n \t\techo \"Fetching submodule submodule\" > ../expect.err.sub &&\n \t\techo \"From $pwd/submodule\" >> ../expect.err.sub &&\n-\t\techo \"   $head1..$head2  main       -> origin/main\" >> ../expect.err.sub\n+\t\techo \"   $head1..$head2  sub        -> origin/sub\" >> ../expect.err.sub\n \t) &&\n \thead1=$(git rev-parse --short HEAD) &&\n \tgit add submodule &&\n \tgit commit -m \"new submodule\" &&\n \thead2=$(git rev-parse --short HEAD) &&\n \techo \"From $pwd/.\" > expect.err.2 &&\n-\techo \"   $head1..$head2  main       -> origin/main\" >> expect.err.2 &&\n+\techo \"   $head1..$head2  super      -> origin/super\" >> expect.err.2 &&\n \tcat expect.err.sub >> expect.err.2 &&\n \ttail -3 expect.err >> expect.err.2 &&\n \t(\n@@ -349,7 +352,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH \"'--recurse-submodules=on-demand' do\n \t\thead2=$(git rev-parse --short HEAD) &&\n \t\techo Fetching submodule submodule > ../expect.err.sub &&\n \t\techo \"From $pwd/submodule\" >> ../expect.err.sub &&\n-\t\techo \"   $head1..$head2  main       -> origin/main\" >> ../expect.err.sub\n+\t\techo \"   $head1..$head2  sub        -> origin/sub\" >> ../expect.err.sub\n \t) &&\n \t(\n \t\tcd downstream &&\n@@ -368,7 +371,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH \"'--recurse-submodules=on-demand' re\n \thead2=$(git rev-parse --short HEAD) &&\n \ttail -3 expect.err > expect.err.deepsub &&\n \techo \"From $pwd/.\" > expect.err &&\n-\techo \"   $head1..$head2  main       -> origin/main\" >>expect.err &&\n+\techo \"   $head1..$head2  super      -> origin/super\" >>expect.err &&\n \tcat expect.err.sub >> expect.err &&\n \tcat expect.err.deepsub >> expect.err &&\n \t(\n@@ -397,7 +400,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH \"'--recurse-submodules=on-demand' st\n \tgit commit -m \"new file\" &&\n \thead2=$(git rev-parse --short HEAD) &&\n \techo \"From $pwd/.\" > expect.err.file &&\n-\techo \"   $head1..$head2  main       -> origin/main\" >> expect.err.file &&\n+\techo \"   $head1..$head2  super      -> origin/super\" >> expect.err.file &&\n \t(\n \t\tcd downstream &&\n \t\tgit fetch --recurse-submodules=on-demand >../actual.out 2>../actual.err\n@@ -418,7 +421,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH \"'fetch.recurseSubmodules=on-demand'\n \tgit commit -m \"new submodule\" &&\n \thead2=$(git rev-parse --short HEAD) &&\n \techo \"From $pwd/.\" > expect.err.2 &&\n-\techo \"   $head1..$head2  main       -> origin/main\" >>expect.err.2 &&\n+\techo \"   $head1..$head2  super      -> origin/super\" >>expect.err.2 &&\n \thead -3 expect.err >> expect.err.2 &&\n \t(\n \t\tcd downstream &&\n@@ -446,7 +449,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH \"'submodule.<sub>.fetchRecurseSubmod\n \tgit commit -m \"new submodule\" &&\n \thead2=$(git rev-parse --short HEAD) &&\n \techo \"From $pwd/.\" > expect.err.2 &&\n-\techo \"   $head1..$head2  main       -> origin/main\" >>expect.err.2 &&\n+\techo \"   $head1..$head2  super      -> origin/super\" >>expect.err.2 &&\n \thead -3 expect.err >> expect.err.2 &&\n \t(\n \t\tcd downstream &&\n@@ -472,7 +475,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH \"don't fetch submodule when newly re\n \tgit commit -m \"submodule rewound\" &&\n \thead2=$(git rev-parse --short HEAD) &&\n \techo \"From $pwd/.\" > expect.err &&\n-\techo \"   $head1..$head2  main       -> origin/main\" >> expect.err &&\n+\techo \"   $head1..$head2  super      -> origin/super\" >> expect.err &&\n \t(\n \t\tcd downstream &&\n \t\tgit fetch >../actual.out 2>../actual.err\n@@ -481,7 +484,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH \"don't fetch submodule when newly re\n \ttest_i18ncmp expect.err actual.err &&\n \t(\n \t\tcd submodule &&\n-\t\tgit checkout -q master\n+\t\tgit checkout -q sub\n \t)\n '\n \n@@ -497,7 +500,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH \"'fetch.recurseSubmodules=on-demand'\n \tgit commit -m \"new submodule without .gitmodules\" &&\n \thead2=$(git rev-parse --short HEAD) &&\n \techo \"From $pwd/.\" >expect.err.2 &&\n-\techo \"   $head1..$head2  main       -> origin/main\" >>expect.err.2 &&\n+\techo \"   $head1..$head2  super      -> origin/super\" >>expect.err.2 &&\n \thead -3 expect.err >>expect.err.2 &&\n \t(\n \t\tcd downstream &&\n@@ -663,9 +666,9 @@ test_expect_success 'fetch new submodule commits on-demand without .gitmodules e\n \tgit config -f .gitmodules --remove-section submodule.sub1 &&\n \tgit add .gitmodules &&\n \tgit commit -m \"delete gitmodules file\" &&\n-\tgit checkout -B master &&\n+\tgit checkout -B super &&\n \tgit -C downstream fetch &&\n-\tgit -C downstream checkout origin/master &&\n+\tgit -C downstream checkout origin/super &&\n \n \tC=$(git -C submodule commit-tree -m \"yet another change outside refs/heads\" HEAD^{tree}) &&\n \tgit -C submodule update-ref refs/changes/7 $C &&\n-- \ngitgitgadget\n\n"},{"id":"411329","messageId":"7348bfdf6539a5bc73e14b475e3463e8ff83ea7a.1607092462.git.gitgitgadget@gmail.com","threadId":"54760","inReplyTo":"pull.806.git.1607092462.gitgitgadget@gmail.com","subject":"[PATCH 2/2] t5526: drop the prereq expecting the default branch name `main`","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2020-12-04T14:34:22Z","receivedAt":"2020-12-04T14:35:10Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin <johannes.schindelin@gmx.de>\n\nInitially, we started converting this test script in anticipation for\nrenaming the default branch name to `main`. To that end, we partially\nconverted it to accommodate for that default branch name, marking the\nnow-failing test cases with a prereq that was designed to be fulfilled\nonce the rename was complete.\n\nHowever, the effort to move to the branch name `main` needs quite a bit\nlonger, as it was decided that we need a deprecation phase first.\n\nTo avoid keeping t5526 in limbo for such a long time, we just made it\nindependent of the actual default branch name used by Git. Therefore,\nthat prereq is no longer necessary, and we can drop it.\n\nSigned-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n---\n t/t5526-fetch-submodules.sh | 42 ++++++++++++++++++-------------------\n 1 file changed, 21 insertions(+), 21 deletions(-)\n\ndiff --git a/t/t5526-fetch-submodules.sh b/t/t5526-fetch-submodules.sh\nindex 6469120ded..a877dd145e 100755\n--- a/t/t5526-fetch-submodules.sh\n+++ b/t/t5526-fetch-submodules.sh\n@@ -64,7 +64,7 @@ test_expect_success setup '\n \t)\n '\n \n-test_expect_success PREPARE_FOR_MAIN_BRANCH \"fetch --recurse-submodules recurses into submodules\" '\n+test_expect_success \"fetch --recurse-submodules recurses into submodules\" '\n \tadd_upstream_commit &&\n \t(\n \t\tcd downstream &&\n@@ -74,7 +74,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH \"fetch --recurse-submodules recurses\n \ttest_i18ncmp expect.err actual.err\n '\n \n-test_expect_success PREPARE_FOR_MAIN_BRANCH \"submodule.recurse option triggers recursive fetch\" '\n+test_expect_success \"submodule.recurse option triggers recursive fetch\" '\n \tadd_upstream_commit &&\n \t(\n \t\tcd downstream &&\n@@ -84,7 +84,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH \"submodule.recurse option triggers r\n \ttest_i18ncmp expect.err actual.err\n '\n \n-test_expect_success PREPARE_FOR_MAIN_BRANCH \"fetch --recurse-submodules -j2 has the same output behaviour\" '\n+test_expect_success \"fetch --recurse-submodules -j2 has the same output behaviour\" '\n \tadd_upstream_commit &&\n \t(\n \t\tcd downstream &&\n@@ -114,7 +114,7 @@ test_expect_success \"fetch --no-recurse-submodules only fetches superproject\" '\n \ttest_must_be_empty actual.err\n '\n \n-test_expect_success PREPARE_FOR_MAIN_BRANCH \"using fetchRecurseSubmodules=true in .gitmodules recurses into submodules\" '\n+test_expect_success \"using fetchRecurseSubmodules=true in .gitmodules recurses into submodules\" '\n \t(\n \t\tcd downstream &&\n \t\tgit config -f .gitmodules submodule.submodule.fetchRecurseSubmodules true &&\n@@ -144,7 +144,7 @@ test_expect_success \"using fetchRecurseSubmodules=false in .git/config overrides\n \ttest_must_be_empty actual.err\n '\n \n-test_expect_success PREPARE_FOR_MAIN_BRANCH \"--recurse-submodules overrides fetchRecurseSubmodules setting from .git/config\" '\n+test_expect_success \"--recurse-submodules overrides fetchRecurseSubmodules setting from .git/config\" '\n \t(\n \t\tcd downstream &&\n \t\tgit fetch --recurse-submodules >../actual.out 2>../actual.err &&\n@@ -173,7 +173,7 @@ test_expect_success \"--quiet propagates to parallel submodules\" '\n \ttest_must_be_empty actual.err\n '\n \n-test_expect_success PREPARE_FOR_MAIN_BRANCH \"--dry-run propagates to submodules\" '\n+test_expect_success \"--dry-run propagates to submodules\" '\n \tadd_upstream_commit &&\n \t(\n \t\tcd downstream &&\n@@ -183,7 +183,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH \"--dry-run propagates to submodules\"\n \ttest_i18ncmp expect.err actual.err\n '\n \n-test_expect_success PREPARE_FOR_MAIN_BRANCH \"Without --dry-run propagates to submodules\" '\n+test_expect_success \"Without --dry-run propagates to submodules\" '\n \t(\n \t\tcd downstream &&\n \t\tgit fetch --recurse-submodules >../actual.out 2>../actual.err\n@@ -192,7 +192,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH \"Without --dry-run propagates to sub\n \ttest_i18ncmp expect.err actual.err\n '\n \n-test_expect_success PREPARE_FOR_MAIN_BRANCH \"recurseSubmodules=true propagates into submodules\" '\n+test_expect_success \"recurseSubmodules=true propagates into submodules\" '\n \tadd_upstream_commit &&\n \t(\n \t\tcd downstream &&\n@@ -203,7 +203,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH \"recurseSubmodules=true propagates i\n \ttest_i18ncmp expect.err actual.err\n '\n \n-test_expect_success PREPARE_FOR_MAIN_BRANCH \"--recurse-submodules overrides config in submodule\" '\n+test_expect_success \"--recurse-submodules overrides config in submodule\" '\n \tadd_upstream_commit &&\n \t(\n \t\tcd downstream &&\n@@ -228,7 +228,7 @@ test_expect_success \"--no-recurse-submodules overrides config setting\" '\n \ttest_must_be_empty actual.err\n '\n \n-test_expect_success PREPARE_FOR_MAIN_BRANCH \"Recursion doesn't happen when no new commits are fetched in the superproject\" '\n+test_expect_success \"Recursion doesn't happen when no new commits are fetched in the superproject\" '\n \t(\n \t\tcd downstream &&\n \t\t(\n@@ -242,7 +242,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH \"Recursion doesn't happen when no ne\n \ttest_must_be_empty actual.err\n '\n \n-test_expect_success PREPARE_FOR_MAIN_BRANCH \"Recursion stops when no new submodule commits are fetched\" '\n+test_expect_success \"Recursion stops when no new submodule commits are fetched\" '\n \thead1=$(git rev-parse --short HEAD) &&\n \tgit add submodule &&\n \tgit commit -m \"new submodule\" &&\n@@ -258,7 +258,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH \"Recursion stops when no new submodu\n \ttest_must_be_empty actual.out\n '\n \n-test_expect_success PREPARE_FOR_MAIN_BRANCH \"Recursion doesn't happen when new superproject commits don't change any submodules\" '\n+test_expect_success \"Recursion doesn't happen when new superproject commits don't change any submodules\" '\n \tadd_upstream_commit &&\n \thead1=$(git rev-parse --short HEAD) &&\n \techo a > file &&\n@@ -275,7 +275,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH \"Recursion doesn't happen when new s\n \ttest_i18ncmp expect.err.file actual.err\n '\n \n-test_expect_success PREPARE_FOR_MAIN_BRANCH \"Recursion picks up config in submodule\" '\n+test_expect_success \"Recursion picks up config in submodule\" '\n \t(\n \t\tcd downstream &&\n \t\tgit fetch --recurse-submodules &&\n@@ -304,7 +304,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH \"Recursion picks up config in submod\n \ttest_must_be_empty actual.out\n '\n \n-test_expect_success PREPARE_FOR_MAIN_BRANCH \"Recursion picks up all submodules when necessary\" '\n+test_expect_success \"Recursion picks up all submodules when necessary\" '\n \tadd_upstream_commit &&\n \t(\n \t\tcd submodule &&\n@@ -337,7 +337,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH \"Recursion picks up all submodules w\n \ttest_must_be_empty actual.out\n '\n \n-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)\" '\n+test_expect_success \"'--recurse-submodules=on-demand' doesn't recurse when no new commits are fetched in the superproject (and ignores config)\" '\n \tadd_upstream_commit &&\n \t(\n \t\tcd submodule &&\n@@ -364,7 +364,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH \"'--recurse-submodules=on-demand' do\n \ttest_must_be_empty actual.err\n '\n \n-test_expect_success PREPARE_FOR_MAIN_BRANCH \"'--recurse-submodules=on-demand' recurses as deep as necessary (and ignores config)\" '\n+test_expect_success \"'--recurse-submodules=on-demand' recurses as deep as necessary (and ignores config)\" '\n \thead1=$(git rev-parse --short HEAD) &&\n \tgit add submodule &&\n \tgit commit -m \"new submodule\" &&\n@@ -392,7 +392,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH \"'--recurse-submodules=on-demand' re\n \ttest_i18ncmp expect.err actual.err\n '\n \n-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)\" '\n+test_expect_success \"'--recurse-submodules=on-demand' stops when no new submodule commits are found in the superproject (and ignores config)\" '\n \tadd_upstream_commit &&\n \thead1=$(git rev-parse --short HEAD) &&\n \techo a >> file &&\n@@ -409,7 +409,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH \"'--recurse-submodules=on-demand' st\n \ttest_i18ncmp expect.err.file actual.err\n '\n \n-test_expect_success PREPARE_FOR_MAIN_BRANCH \"'fetch.recurseSubmodules=on-demand' overrides global config\" '\n+test_expect_success \"'fetch.recurseSubmodules=on-demand' overrides global config\" '\n \t(\n \t\tcd downstream &&\n \t\tgit fetch --recurse-submodules\n@@ -437,7 +437,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH \"'fetch.recurseSubmodules=on-demand'\n \ttest_i18ncmp expect.err.2 actual.err\n '\n \n-test_expect_success PREPARE_FOR_MAIN_BRANCH \"'submodule.<sub>.fetchRecurseSubmodules=on-demand' overrides fetch.recurseSubmodules\" '\n+test_expect_success \"'submodule.<sub>.fetchRecurseSubmodules=on-demand' overrides fetch.recurseSubmodules\" '\n \t(\n \t\tcd downstream &&\n \t\tgit fetch --recurse-submodules\n@@ -465,7 +465,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH \"'submodule.<sub>.fetchRecurseSubmod\n \ttest_i18ncmp expect.err.2 actual.err\n '\n \n-test_expect_success PREPARE_FOR_MAIN_BRANCH \"don't fetch submodule when newly recorded commits are already present\" '\n+test_expect_success \"don't fetch submodule when newly recorded commits are already present\" '\n \t(\n \t\tcd submodule &&\n \t\tgit checkout -q HEAD^^\n@@ -488,7 +488,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH \"don't fetch submodule when newly re\n \t)\n '\n \n-test_expect_success PREPARE_FOR_MAIN_BRANCH \"'fetch.recurseSubmodules=on-demand' works also without .gitmodules entry\" '\n+test_expect_success \"'fetch.recurseSubmodules=on-demand' works also without .gitmodules entry\" '\n \t(\n \t\tcd downstream &&\n \t\tgit fetch --recurse-submodules\n-- \ngitgitgadget\n"},{"id":"411368","messageId":"xmqqr1o5e3t9.fsf@gitster.c.googlers.com","threadId":"54760","inReplyTo":"pull.806.git.1607092462.gitgitgadget@gmail.com","subject":"Re: [PATCH 0/2] Make t5526 independent of the default branch name","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2020-12-04T20:04:02Z","receivedAt":"2020-12-04T20:04:48Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Johannes Schindelin via GitGitGadget\" <gitgitgadget@gmail.com>\nwrites:\n\n> This patch series addresses that by overriding the initial branch names\n> explicitly in t5526, and then removing the no-longer-needed prerequisite.\n\nNice.\n\nWill queue; thanks.\n"}]}