{"thread":{"id":"57021","subject":"[PATCH] tests: set GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME only when needed","startedAt":"2021-12-03T09:39:19Z","lastAt":"2021-12-05T19:34:56Z","messageCount":2,"participants":["Johannes Schindelin via GitGitGadget","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"442958","messageId":"pull.1089.git.1638524353230.gitgitgadget@gmail.com","threadId":"57021","inReplyTo":null,"subject":"[PATCH] tests: set GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME only when needed","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2021-12-03T09:39:13Z","receivedAt":"2021-12-03T09:39:19Z","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\nA couple of test scripts have actually been adapted to accommodate for a\nconfigurable default branch name, but they still overrode it via the\n`GIT_TEST_*` variable. Let's drop that override where possible.\n\nSigned-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n---\n    Drop GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME where possible\n    \n    We still set this variable in quite a couple of test scripts. Some of\n    them do not actually need it anymore, though.\n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-1089%2Fdscho%2Ft3404-and-default-branch-name-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1089/dscho/t3404-and-default-branch-name-v1\nPull-Request: https://github.com/gitgitgadget/git/pull/1089\n\n t/t1022-read-tree-partial-clone.sh | 3 ---\n t/t1400-update-ref.sh              | 3 ---\n t/t3201-branch-contains.sh         | 3 ---\n t/t3203-branch-output.sh           | 3 ---\n t/t3205-branch-color.sh            | 3 ---\n t/t3404-rebase-interactive.sh      | 2 --\n t/t5310-pack-bitmaps.sh            | 2 --\n t/t5505-remote.sh                  | 3 ---\n t/t5510-fetch.sh                   | 3 ---\n t/t5526-fetch-submodules.sh        | 3 ---\n t/t5703-upload-pack-ref-in-want.sh | 3 ---\n t/t6300-for-each-ref.sh            | 3 ---\n t/t6302-for-each-ref-filter.sh     | 3 ---\n t/t7064-wtstatus-pv2.sh            | 4 ----\n t/t9151-svn-mergeinfo.sh           | 3 ---\n t/t9603-cvsimport-patchsets.sh     | 3 ---\n t/t9902-completion.sh              | 3 ---\n 17 files changed, 50 deletions(-)\n\ndiff --git a/t/t1022-read-tree-partial-clone.sh b/t/t1022-read-tree-partial-clone.sh\nindex a763e27c7da..a9953b6a71c 100755\n--- a/t/t1022-read-tree-partial-clone.sh\n+++ b/t/t1022-read-tree-partial-clone.sh\n@@ -4,9 +4,6 @@ test_description='git read-tree in partial clones'\n \n TEST_NO_CREATE_REPO=1\n \n-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main\n-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\n-\n . ./test-lib.sh\n \n test_expect_success 'read-tree in partial clone prefetches in one batch' '\ndiff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh\nindex 0d4f73acaa8..406f5938fbd 100755\n--- a/t/t1400-update-ref.sh\n+++ b/t/t1400-update-ref.sh\n@@ -4,9 +4,6 @@\n #\n \n test_description='Test git update-ref and basic ref logging'\n-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main\n-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\n-\n . ./test-lib.sh\n \n Z=$ZERO_OID\ndiff --git a/t/t3201-branch-contains.sh b/t/t3201-branch-contains.sh\nindex 349a810cee1..800fc33165a 100755\n--- a/t/t3201-branch-contains.sh\n+++ b/t/t3201-branch-contains.sh\n@@ -2,9 +2,6 @@\n \n test_description='branch --contains <commit>, --no-contains <commit> --merged, and --no-merged'\n \n-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main\n-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\n-\n . ./test-lib.sh\n \n test_expect_success setup '\ndiff --git a/t/t3203-branch-output.sh b/t/t3203-branch-output.sh\nindex 6e94c6db7b5..d34d77f8934 100755\n--- a/t/t3203-branch-output.sh\n+++ b/t/t3203-branch-output.sh\n@@ -1,9 +1,6 @@\n #!/bin/sh\n \n test_description='git branch display tests'\n-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main\n-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\n-\n . ./test-lib.sh\n . \"$TEST_DIRECTORY\"/lib-terminal.sh\n \ndiff --git a/t/t3205-branch-color.sh b/t/t3205-branch-color.sh\nindex 6a521c1a3e5..0b61da92b37 100755\n--- a/t/t3205-branch-color.sh\n+++ b/t/t3205-branch-color.sh\n@@ -1,9 +1,6 @@\n #!/bin/sh\n \n test_description='basic branch output coloring'\n-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main\n-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\n-\n TEST_PASSES_SANITIZE_LEAK=true\n . ./test-lib.sh\n \ndiff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh\nindex 12eb2269576..0baa68e9b4f 100755\n--- a/t/t3404-rebase-interactive.sh\n+++ b/t/t3404-rebase-interactive.sh\n@@ -25,8 +25,6 @@ Initial setup:\n  where A, B, D and G all touch file1, and one, two, three, four all\n  touch file \"conflict\".\n '\n-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\n-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\n \n . ./test-lib.sh\n \ndiff --git a/t/t5310-pack-bitmaps.sh b/t/t5310-pack-bitmaps.sh\nindex dcf03d324a2..b8a29950cc2 100755\n--- a/t/t5310-pack-bitmaps.sh\n+++ b/t/t5310-pack-bitmaps.sh\n@@ -1,8 +1,6 @@\n #!/bin/sh\n \n test_description='exercise basic bitmap functionality'\n-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\n-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\n \n . ./test-lib.sh\n . \"$TEST_DIRECTORY\"/lib-bitmap.sh\ndiff --git a/t/t5505-remote.sh b/t/t5505-remote.sh\nindex e6e3c8f552c..7ce1a28ef65 100755\n--- a/t/t5505-remote.sh\n+++ b/t/t5505-remote.sh\n@@ -2,9 +2,6 @@\n \n test_description='git remote porcelain-ish'\n \n-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main\n-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\n-\n . ./test-lib.sh\n \n setup_repository () {\ndiff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh\nindex a0faf0dd949..8c33755c267 100755\n--- a/t/t5510-fetch.sh\n+++ b/t/t5510-fetch.sh\n@@ -5,9 +5,6 @@ test_description='Per branch config variables affects \"git fetch\".\n \n '\n \n-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main\n-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\n-\n . ./test-lib.sh\n . \"$TEST_DIRECTORY\"/lib-bundle.sh\n \ndiff --git a/t/t5526-fetch-submodules.sh b/t/t5526-fetch-submodules.sh\nindex 2dc75b80db8..840c89cc8b9 100755\n--- a/t/t5526-fetch-submodules.sh\n+++ b/t/t5526-fetch-submodules.sh\n@@ -3,9 +3,6 @@\n \n test_description='Recursive \"git fetch\" for submodules'\n \n-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\n-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\n-\n GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB=1\n export GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB\n \ndiff --git a/t/t5703-upload-pack-ref-in-want.sh b/t/t5703-upload-pack-ref-in-want.sh\nindex 220098523a6..9d6cd7d9864 100755\n--- a/t/t5703-upload-pack-ref-in-want.sh\n+++ b/t/t5703-upload-pack-ref-in-want.sh\n@@ -2,9 +2,6 @@\n \n test_description='upload-pack ref-in-want'\n \n-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main\n-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\n-\n . ./test-lib.sh\n \n get_actual_refs () {\ndiff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh\nindex 9f2c706c12a..6aa9fb17ea3 100755\n--- a/t/t6300-for-each-ref.sh\n+++ b/t/t6300-for-each-ref.sh\n@@ -5,9 +5,6 @@\n \n test_description='for-each-ref test'\n \n-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\n-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\n-\n . ./test-lib.sh\n . \"$TEST_DIRECTORY\"/lib-gpg.sh\n . \"$TEST_DIRECTORY\"/lib-terminal.sh\ndiff --git a/t/t6302-for-each-ref-filter.sh b/t/t6302-for-each-ref-filter.sh\nindex 1537aa21798..1ce5f490e99 100755\n--- a/t/t6302-for-each-ref-filter.sh\n+++ b/t/t6302-for-each-ref-filter.sh\n@@ -2,9 +2,6 @@\n \n test_description='test for-each-refs usage of ref-filter APIs'\n \n-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main\n-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\n-\n . ./test-lib.sh\n . \"$TEST_DIRECTORY\"/lib-gpg.sh\n \ndiff --git a/t/t7064-wtstatus-pv2.sh b/t/t7064-wtstatus-pv2.sh\nindex 47fc21d9623..20a0d2afc2a 100755\n--- a/t/t7064-wtstatus-pv2.sh\n+++ b/t/t7064-wtstatus-pv2.sh\n@@ -4,10 +4,6 @@ test_description='git status --porcelain=v2\n \n This test exercises porcelain V2 output for git status.'\n \n-\n-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\n-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\n-\n . ./test-lib.sh\n \n \ndiff --git a/t/t9151-svn-mergeinfo.sh b/t/t9151-svn-mergeinfo.sh\nindex 1fbe84feb16..c93a5beab25 100755\n--- a/t/t9151-svn-mergeinfo.sh\n+++ b/t/t9151-svn-mergeinfo.sh\n@@ -5,9 +5,6 @@\n \n test_description='git-svn svn mergeinfo properties'\n \n-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main\n-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\n-\n . ./lib-git-svn.sh\n \n test_expect_success 'load svn dump' \"\ndiff --git a/t/t9603-cvsimport-patchsets.sh b/t/t9603-cvsimport-patchsets.sh\nindex 0e9daa5768c..19f38f78f2b 100755\n--- a/t/t9603-cvsimport-patchsets.sh\n+++ b/t/t9603-cvsimport-patchsets.sh\n@@ -12,9 +12,6 @@\n # bug.\n \n test_description='git cvsimport testing for correct patchset estimation'\n-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main\n-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\n-\n . ./lib-cvs.sh\n \n setup_cvs_test_repository t9603\ndiff --git a/t/t9902-completion.sh b/t/t9902-completion.sh\nindex 518203fbe07..0f28c4ad940 100755\n--- a/t/t9902-completion.sh\n+++ b/t/t9902-completion.sh\n@@ -5,9 +5,6 @@\n \n test_description='test bash completion'\n \n-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\n-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\n-\n . ./lib-bash.sh\n \n complete ()\n\nbase-commit: abe6bb3905392d5eb6b01fa6e54d7e784e0522aa\n-- \ngitgitgadget\n"},{"id":"443113","messageId":"xmqqbl1uluau.fsf@gitster.g","threadId":"57021","inReplyTo":"pull.1089.git.1638524353230.gitgitgadget@gmail.com","subject":"Re: [PATCH] tests: set GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME only when needed","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2021-12-05T19:34:49Z","receivedAt":"2021-12-05T19:34:56Z","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> From: Johannes Schindelin <johannes.schindelin@gmx.de>\n>\n> A couple of test scripts have actually been adapted to accommodate for a\n> configurable default branch name, but they still overrode it via the\n> `GIT_TEST_*` variable. Let's drop that override where possible.\n\nNice clean-up.  Will apply.  Thanks.\n\n> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n> ---\n>     Drop GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME where possible\n>     \n>     We still set this variable in quite a couple of test scripts. Some of\n>     them do not actually need it anymore, though.\n>\n> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1089%2Fdscho%2Ft3404-and-default-branch-name-v1\n> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1089/dscho/t3404-and-default-branch-name-v1\n> Pull-Request: https://github.com/gitgitgadget/git/pull/1089\n>\n>  t/t1022-read-tree-partial-clone.sh | 3 ---\n>  t/t1400-update-ref.sh              | 3 ---\n>  t/t3201-branch-contains.sh         | 3 ---\n>  t/t3203-branch-output.sh           | 3 ---\n>  t/t3205-branch-color.sh            | 3 ---\n>  t/t3404-rebase-interactive.sh      | 2 --\n>  t/t5310-pack-bitmaps.sh            | 2 --\n>  t/t5505-remote.sh                  | 3 ---\n>  t/t5510-fetch.sh                   | 3 ---\n>  t/t5526-fetch-submodules.sh        | 3 ---\n>  t/t5703-upload-pack-ref-in-want.sh | 3 ---\n>  t/t6300-for-each-ref.sh            | 3 ---\n>  t/t6302-for-each-ref-filter.sh     | 3 ---\n>  t/t7064-wtstatus-pv2.sh            | 4 ----\n>  t/t9151-svn-mergeinfo.sh           | 3 ---\n>  t/t9603-cvsimport-patchsets.sh     | 3 ---\n>  t/t9902-completion.sh              | 3 ---\n>  17 files changed, 50 deletions(-)\n>\n> diff --git a/t/t1022-read-tree-partial-clone.sh b/t/t1022-read-tree-partial-clone.sh\n> index a763e27c7da..a9953b6a71c 100755\n> --- a/t/t1022-read-tree-partial-clone.sh\n> +++ b/t/t1022-read-tree-partial-clone.sh\n> @@ -4,9 +4,6 @@ test_description='git read-tree in partial clones'\n>  \n>  TEST_NO_CREATE_REPO=1\n>  \n> -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main\n> -export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\n> -\n>  . ./test-lib.sh\n>  \n>  test_expect_success 'read-tree in partial clone prefetches in one batch' '\n> diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh\n> index 0d4f73acaa8..406f5938fbd 100755\n> --- a/t/t1400-update-ref.sh\n> +++ b/t/t1400-update-ref.sh\n> @@ -4,9 +4,6 @@\n>  #\n>  \n>  test_description='Test git update-ref and basic ref logging'\n> -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main\n> -export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\n> -\n>  . ./test-lib.sh\n>  \n>  Z=$ZERO_OID\n> diff --git a/t/t3201-branch-contains.sh b/t/t3201-branch-contains.sh\n> index 349a810cee1..800fc33165a 100755\n> --- a/t/t3201-branch-contains.sh\n> +++ b/t/t3201-branch-contains.sh\n> @@ -2,9 +2,6 @@\n>  \n>  test_description='branch --contains <commit>, --no-contains <commit> --merged, and --no-merged'\n>  \n> -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main\n> -export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\n> -\n>  . ./test-lib.sh\n>  \n>  test_expect_success setup '\n> diff --git a/t/t3203-branch-output.sh b/t/t3203-branch-output.sh\n> index 6e94c6db7b5..d34d77f8934 100755\n> --- a/t/t3203-branch-output.sh\n> +++ b/t/t3203-branch-output.sh\n> @@ -1,9 +1,6 @@\n>  #!/bin/sh\n>  \n>  test_description='git branch display tests'\n> -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main\n> -export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\n> -\n>  . ./test-lib.sh\n>  . \"$TEST_DIRECTORY\"/lib-terminal.sh\n>  \n> diff --git a/t/t3205-branch-color.sh b/t/t3205-branch-color.sh\n> index 6a521c1a3e5..0b61da92b37 100755\n> --- a/t/t3205-branch-color.sh\n> +++ b/t/t3205-branch-color.sh\n> @@ -1,9 +1,6 @@\n>  #!/bin/sh\n>  \n>  test_description='basic branch output coloring'\n> -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main\n> -export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\n> -\n>  TEST_PASSES_SANITIZE_LEAK=true\n>  . ./test-lib.sh\n>  \n> diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh\n> index 12eb2269576..0baa68e9b4f 100755\n> --- a/t/t3404-rebase-interactive.sh\n> +++ b/t/t3404-rebase-interactive.sh\n> @@ -25,8 +25,6 @@ Initial setup:\n>   where A, B, D and G all touch file1, and one, two, three, four all\n>   touch file \"conflict\".\n>  '\n> -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\n> -export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\n>  \n>  . ./test-lib.sh\n>  \n> diff --git a/t/t5310-pack-bitmaps.sh b/t/t5310-pack-bitmaps.sh\n> index dcf03d324a2..b8a29950cc2 100755\n> --- a/t/t5310-pack-bitmaps.sh\n> +++ b/t/t5310-pack-bitmaps.sh\n> @@ -1,8 +1,6 @@\n>  #!/bin/sh\n>  \n>  test_description='exercise basic bitmap functionality'\n> -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\n> -export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\n>  \n>  . ./test-lib.sh\n>  . \"$TEST_DIRECTORY\"/lib-bitmap.sh\n> diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh\n> index e6e3c8f552c..7ce1a28ef65 100755\n> --- a/t/t5505-remote.sh\n> +++ b/t/t5505-remote.sh\n> @@ -2,9 +2,6 @@\n>  \n>  test_description='git remote porcelain-ish'\n>  \n> -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main\n> -export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\n> -\n>  . ./test-lib.sh\n>  \n>  setup_repository () {\n> diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh\n> index a0faf0dd949..8c33755c267 100755\n> --- a/t/t5510-fetch.sh\n> +++ b/t/t5510-fetch.sh\n> @@ -5,9 +5,6 @@ test_description='Per branch config variables affects \"git fetch\".\n>  \n>  '\n>  \n> -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main\n> -export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\n> -\n>  . ./test-lib.sh\n>  . \"$TEST_DIRECTORY\"/lib-bundle.sh\n>  \n> diff --git a/t/t5526-fetch-submodules.sh b/t/t5526-fetch-submodules.sh\n> index 2dc75b80db8..840c89cc8b9 100755\n> --- a/t/t5526-fetch-submodules.sh\n> +++ b/t/t5526-fetch-submodules.sh\n> @@ -3,9 +3,6 @@\n>  \n>  test_description='Recursive \"git fetch\" for submodules'\n>  \n> -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\n> -export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\n> -\n>  GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB=1\n>  export GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB\n>  \n> diff --git a/t/t5703-upload-pack-ref-in-want.sh b/t/t5703-upload-pack-ref-in-want.sh\n> index 220098523a6..9d6cd7d9864 100755\n> --- a/t/t5703-upload-pack-ref-in-want.sh\n> +++ b/t/t5703-upload-pack-ref-in-want.sh\n> @@ -2,9 +2,6 @@\n>  \n>  test_description='upload-pack ref-in-want'\n>  \n> -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main\n> -export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\n> -\n>  . ./test-lib.sh\n>  \n>  get_actual_refs () {\n> diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh\n> index 9f2c706c12a..6aa9fb17ea3 100755\n> --- a/t/t6300-for-each-ref.sh\n> +++ b/t/t6300-for-each-ref.sh\n> @@ -5,9 +5,6 @@\n>  \n>  test_description='for-each-ref test'\n>  \n> -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\n> -export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\n> -\n>  . ./test-lib.sh\n>  . \"$TEST_DIRECTORY\"/lib-gpg.sh\n>  . \"$TEST_DIRECTORY\"/lib-terminal.sh\n> diff --git a/t/t6302-for-each-ref-filter.sh b/t/t6302-for-each-ref-filter.sh\n> index 1537aa21798..1ce5f490e99 100755\n> --- a/t/t6302-for-each-ref-filter.sh\n> +++ b/t/t6302-for-each-ref-filter.sh\n> @@ -2,9 +2,6 @@\n>  \n>  test_description='test for-each-refs usage of ref-filter APIs'\n>  \n> -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main\n> -export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\n> -\n>  . ./test-lib.sh\n>  . \"$TEST_DIRECTORY\"/lib-gpg.sh\n>  \n> diff --git a/t/t7064-wtstatus-pv2.sh b/t/t7064-wtstatus-pv2.sh\n> index 47fc21d9623..20a0d2afc2a 100755\n> --- a/t/t7064-wtstatus-pv2.sh\n> +++ b/t/t7064-wtstatus-pv2.sh\n> @@ -4,10 +4,6 @@ test_description='git status --porcelain=v2\n>  \n>  This test exercises porcelain V2 output for git status.'\n>  \n> -\n> -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\n> -export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\n> -\n>  . ./test-lib.sh\n>  \n>  \n> diff --git a/t/t9151-svn-mergeinfo.sh b/t/t9151-svn-mergeinfo.sh\n> index 1fbe84feb16..c93a5beab25 100755\n> --- a/t/t9151-svn-mergeinfo.sh\n> +++ b/t/t9151-svn-mergeinfo.sh\n> @@ -5,9 +5,6 @@\n>  \n>  test_description='git-svn svn mergeinfo properties'\n>  \n> -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main\n> -export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\n> -\n>  . ./lib-git-svn.sh\n>  \n>  test_expect_success 'load svn dump' \"\n> diff --git a/t/t9603-cvsimport-patchsets.sh b/t/t9603-cvsimport-patchsets.sh\n> index 0e9daa5768c..19f38f78f2b 100755\n> --- a/t/t9603-cvsimport-patchsets.sh\n> +++ b/t/t9603-cvsimport-patchsets.sh\n> @@ -12,9 +12,6 @@\n>  # bug.\n>  \n>  test_description='git cvsimport testing for correct patchset estimation'\n> -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main\n> -export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\n> -\n>  . ./lib-cvs.sh\n>  \n>  setup_cvs_test_repository t9603\n> diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh\n> index 518203fbe07..0f28c4ad940 100755\n> --- a/t/t9902-completion.sh\n> +++ b/t/t9902-completion.sh\n> @@ -5,9 +5,6 @@\n>  \n>  test_description='test bash completion'\n>  \n> -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\n> -export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\n> -\n>  . ./lib-bash.sh\n>  \n>  complete ()\n>\n> base-commit: abe6bb3905392d5eb6b01fa6e54d7e784e0522aa\n"}]}