tests: set GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME only when needed

A couple of test scripts have actually been adapted to accommodate for a configurable default branch name, but they still overrode it via the `GIT_TEST_*` variable. Let's drop that override where possible. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
3 years ago · 9f3547837e
17 changed files with 0 additions and 50 deletions
--- a/t/t1022-read-tree-partial-clone.sh
+++ b/t/t1022-read-tree-partial-clone.sh
@ -4,9 +4,6 @@ test_description='git read-tree in partial clones'
				@@ -4,9 +4,6 @@ test_description='git read-tree in partial clones'

 TEST_NO_CREATE_REPO=1

-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
-
 . ./test-lib.sh

 test_expect_success 'read-tree in partial clone prefetches in one batch' '
--- a/t/t1400-update-ref.sh
+++ b/t/t1400-update-ref.sh
@ -4,9 +4,6 @@
				@@ -4,9 +4,6 @@
 #

 test_description='Test git update-ref and basic ref logging'
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
-
 . ./test-lib.sh

 Z=$ZERO_OID
--- a/t/t3201-branch-contains.sh
+++ b/t/t3201-branch-contains.sh
@ -2,9 +2,6 @@
				@@ -2,9 +2,6 @@

 test_description='branch --contains <commit>, --no-contains <commit> --merged, and --no-merged'

-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
-
 . ./test-lib.sh

 test_expect_success setup '
--- a/t/t3203-branch-output.sh
+++ b/t/t3203-branch-output.sh
@ -1,9 +1,6 @@
				@@ -1,9 +1,6 @@
 #!/bin/sh

 test_description='git branch display tests'
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
-
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-terminal.sh

--- a/t/t3205-branch-color.sh
+++ b/t/t3205-branch-color.sh
@ -1,9 +1,6 @@
				@@ -1,9 +1,6 @@
 #!/bin/sh

 test_description='basic branch output coloring'
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
-
 TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh

--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@ -25,8 +25,6 @@ Initial setup:
				@@ -25,8 +25,6 @@ Initial setup:
 where A, B, D and G all touch file1, and one, two, three, four all
 touch file "conflict".
 '
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME

 . ./test-lib.sh

--- a/t/t5310-pack-bitmaps.sh
+++ b/t/t5310-pack-bitmaps.sh
@ -1,8 +1,6 @@
				@@ -1,8 +1,6 @@
 #!/bin/sh

 test_description='exercise basic bitmap functionality'
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME

 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-bitmap.sh
--- a/t/t5505-remote.sh
+++ b/t/t5505-remote.sh
@ -2,9 +2,6 @@
				@@ -2,9 +2,6 @@

 test_description='git remote porcelain-ish'

-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
-
 . ./test-lib.sh

 setup_repository () {
--- a/t/t5510-fetch.sh
+++ b/t/t5510-fetch.sh
@ -5,9 +5,6 @@ test_description='Per branch config variables affects "git fetch".
				@@ -5,9 +5,6 @@ test_description='Per branch config variables affects "git fetch".

 '

-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
-
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-bundle.sh

--- a/t/t5526-fetch-submodules.sh
+++ b/t/t5526-fetch-submodules.sh
@ -3,9 +3,6 @@
				@@ -3,9 +3,6 @@

 test_description='Recursive "git fetch" for submodules'

-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
-
 GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB=1
 export GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB

--- a/t/t5703-upload-pack-ref-in-want.sh
+++ b/t/t5703-upload-pack-ref-in-want.sh
@ -2,9 +2,6 @@
				@@ -2,9 +2,6 @@

 test_description='upload-pack ref-in-want'

-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
-
 . ./test-lib.sh

 get_actual_refs () {
--- a/t/t6300-for-each-ref.sh
+++ b/t/t6300-for-each-ref.sh
@ -5,9 +5,6 @@
				@@ -5,9 +5,6 @@

 test_description='for-each-ref test'

-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
-
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-gpg.sh
 . "$TEST_DIRECTORY"/lib-terminal.sh
--- a/t/t6302-for-each-ref-filter.sh
+++ b/t/t6302-for-each-ref-filter.sh
@ -2,9 +2,6 @@
				@@ -2,9 +2,6 @@

 test_description='test for-each-refs usage of ref-filter APIs'

-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
-
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-gpg.sh

--- a/t/t7064-wtstatus-pv2.sh
+++ b/t/t7064-wtstatus-pv2.sh
@ -4,10 +4,6 @@ test_description='git status --porcelain=v2
				@@ -4,10 +4,6 @@ test_description='git status --porcelain=v2

 This test exercises porcelain V2 output for git status.'

-
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
-
 . ./test-lib.sh


--- a/t/t9151-svn-mergeinfo.sh
+++ b/t/t9151-svn-mergeinfo.sh
@ -5,9 +5,6 @@
				@@ -5,9 +5,6 @@

 test_description='git-svn svn mergeinfo properties'

-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
-
 . ./lib-git-svn.sh

 test_expect_success 'load svn dump' "
--- a/t/t9603-cvsimport-patchsets.sh
+++ b/t/t9603-cvsimport-patchsets.sh
@ -12,9 +12,6 @@
				@@ -12,9 +12,6 @@
 # bug.

 test_description='git cvsimport testing for correct patchset estimation'
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
-
 . ./lib-cvs.sh

 setup_cvs_test_repository t9603
--- a/t/t9902-completion.sh
+++ b/t/t9902-completion.sh
@ -5,9 +5,6 @@
				@@ -5,9 +5,6 @@

 test_description='test bash completion'

-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
-
 . ./lib-bash.sh

 complete ()