From: Phillip Wood <phillip.wood@xxxxxxxxxxxxx> As the tests are all run in separate repositories, set the branch name to "master" when creating the repository for the tests where the result depends on the branch name. This reduceds the number of tests that depend on the default branch name being "master" and removes the last instance of a test file using "GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= master". Signed-off-by: Phillip Wood <phillip.wood@xxxxxxxxxxxxx> --- t/t0613-reftable-write-options.sh | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/t/t0613-reftable-write-options.sh b/t/t0613-reftable-write-options.sh index d77e601111f..6d00432219f 100755 --- a/t/t0613-reftable-write-options.sh +++ b/t/t0613-reftable-write-options.sh @@ -11,16 +11,14 @@ export GIT_TEST_REFTABLE_AUTOCOMPACTION # Block sizes depend on the hash function, so we force SHA1 here. GIT_TEST_DEFAULT_HASH=sha1 export GIT_TEST_DEFAULT_HASH -# Block sizes also depend on the actual refs we write, so we force "master" to -# be the default initial branch name. -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master -export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh test_expect_success 'default write options' ' test_when_finished "rm -rf repo" && - git init repo && + # Block sizes also depend on the actual refs we write, so we force + # "master" to be the default initial branch name. + git init --initial-branch master repo && ( cd repo && test_commit initial && @@ -43,7 +41,7 @@ test_expect_success 'default write options' ' test_expect_success 'disabled reflog writes no log blocks' ' test_config_global core.logAllRefUpdates false && test_when_finished "rm -rf repo" && - git init repo && + git init --initial-branch master repo && ( cd repo && test_commit initial && @@ -62,7 +60,7 @@ test_expect_success 'disabled reflog writes no log blocks' ' test_expect_success 'many refs results in multiple blocks' ' test_when_finished "rm -rf repo" && - git init repo && + git init --initial-branch master repo && ( cd repo && test_commit initial && @@ -115,7 +113,7 @@ test_expect_success 'tiny block size leads to error' ' test_expect_success 'small block size leads to multiple ref blocks' ' test_config_global core.logAllRefUpdates false && test_when_finished "rm -rf repo" && - git init repo && + git init --initial-branch master repo && ( cd repo && test_commit A && @@ -172,7 +170,7 @@ test_expect_success 'block size exceeding maximum supported size' ' test_expect_success 'restart interval at every single record' ' test_when_finished "rm -rf repo" && - git init repo && + git init --initial-branch master repo && ( cd repo && test_commit initial && @@ -212,7 +210,7 @@ test_expect_success 'restart interval exceeding maximum supported interval' ' test_expect_success 'object index gets written by default with ref index' ' test_config_global core.logAllRefUpdates false && test_when_finished "rm -rf repo" && - git init repo && + git init --initial-branch master repo && ( cd repo && test_commit initial && @@ -247,7 +245,7 @@ test_expect_success 'object index gets written by default with ref index' ' test_expect_success 'object index can be disabled' ' test_config_global core.logAllRefUpdates false && test_when_finished "rm -rf repo" && - git init repo && + git init --initial-branch master repo && ( cd repo && test_commit initial && -- 2.49.0.897.gfad3eb7d210
