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>
Johannes Schindelin committed
Dec 3, 2021 at 09:39 UTC
9f3547837e7565f37f587a1626e9c4af79aff275
17 files changed
-50
t/t1022-read-tree-partial-clone.sh
-3
@@ -4,9 +4,6 @@ test_description='git read-tree in partial clones'
4
5
TEST_NO_CREATE_REPO=1
6
7
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
8
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
9
-
7
. ./test-lib.sh
8
9
test_expect_success 'read-tree in partial clone prefetches in one batch' '
t/t1400-update-ref.sh
-3
@@ -4,9 +4,6 @@
4
#
5
6
test_description='Test git update-ref and basic ref logging'
7
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
8
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
9
-
7
. ./test-lib.sh
8
9
Z=$ZERO_OID
t/t3201-branch-contains.sh
-3
@@ -2,9 +2,6 @@
2
3
test_description='branch --contains <commit>, --no-contains <commit> --merged, and --no-merged'
4
5
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
6
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
7
-
5
. ./test-lib.sh
6
7
test_expect_success setup '
t/t3203-branch-output.sh
-3
@@ -1,9 +1,6 @@
1
#!/bin/sh
2
3
test_description='git branch display tests'
4
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
5
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
6
-
4
. ./test-lib.sh
5
. "$TEST_DIRECTORY"/lib-terminal.sh
6
t/t3205-branch-color.sh
-3
@@ -1,9 +1,6 @@
1
#!/bin/sh
2
3
test_description='basic branch output coloring'
4
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
5
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
6
-
4
TEST_PASSES_SANITIZE_LEAK=true
5
. ./test-lib.sh
6
t/t3404-rebase-interactive.sh
-2
@@ -25,8 +25,6 @@ Initial setup:
25
where A, B, D and G all touch file1, and one, two, three, four all
26
touch file "conflict".
27
'
28
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
29
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
28
29
. ./test-lib.sh
30
t/t5310-pack-bitmaps.sh
-2
@@ -1,8 +1,6 @@
1
#!/bin/sh
2
3
test_description='exercise basic bitmap functionality'
4
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
5
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
4
5
. ./test-lib.sh
6
. "$TEST_DIRECTORY"/lib-bitmap.sh
t/t5505-remote.sh
-3
@@ -2,9 +2,6 @@
2
3
test_description='git remote porcelain-ish'
4
5
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
6
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
7
-
5
. ./test-lib.sh
6
7
setup_repository () {
t/t5510-fetch.sh
-3
@@ -5,9 +5,6 @@ test_description='Per branch config variables affects "git fetch".
5
6
'
7
8
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
9
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
10
-
8
. ./test-lib.sh
9
. "$TEST_DIRECTORY"/lib-bundle.sh
10
t/t5526-fetch-submodules.sh
-3
@@ -3,9 +3,6 @@
3
4
test_description='Recursive "git fetch" for submodules'
5
6
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
7
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
8
-
6
GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB=1
7
export GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB
8
t/t5703-upload-pack-ref-in-want.sh
-3
@@ -2,9 +2,6 @@
2
3
test_description='upload-pack ref-in-want'
4
5
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
6
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
7
-
5
. ./test-lib.sh
6
7
get_actual_refs () {
t/t6300-for-each-ref.sh
-3
@@ -5,9 +5,6 @@
5
6
test_description='for-each-ref test'
7
8
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
9
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
10
-
8
. ./test-lib.sh
9
. "$TEST_DIRECTORY"/lib-gpg.sh
10
. "$TEST_DIRECTORY"/lib-terminal.sh
t/t6302-for-each-ref-filter.sh
-3
@@ -2,9 +2,6 @@
2
3
test_description='test for-each-refs usage of ref-filter APIs'
4
5
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
6
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
7
-
5
. ./test-lib.sh
6
. "$TEST_DIRECTORY"/lib-gpg.sh
7
t/t7064-wtstatus-pv2.sh
-4
@@ -4,10 +4,6 @@ test_description='git status --porcelain=v2
4
5
This test exercises porcelain V2 output for git status.'
6
7
-
8
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
9
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
10
-
7
. ./test-lib.sh
8
9
t/t9151-svn-mergeinfo.sh
-3
@@ -5,9 +5,6 @@
5
6
test_description='git-svn svn mergeinfo properties'
7
8
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
9
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
10
-
8
. ./lib-git-svn.sh
9
10
test_expect_success 'load svn dump' "
t/t9603-cvsimport-patchsets.sh
-3
@@ -12,9 +12,6 @@
12
# bug.
13
14
test_description='git cvsimport testing for correct patchset estimation'
15
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
16
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
17
-
15
. ./lib-cvs.sh
16
17
setup_cvs_test_repository t9603
t/t9902-completion.sh
-3
@@ -5,9 +5,6 @@
5
6
test_description='test bash completion'
7
8
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
9
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
10
-
8
. ./lib-bash.sh
9
10
complete ()