diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-01-25 22:19:18 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-01-25 22:19:18 (GMT) |
| commit | 27d7c8599b159862762e2bd121c22d516fb04e90 (patch) | |
| tree | 91bed47151791fe2e18e8e9e07a5d58207413bda /t/t1700-split-index.sh | |
| parent | 440acfbe0cec5c2316ef7a706c975143c4902b20 (diff) | |
| parent | 8b70966aa90b52427e1a09329abde8d845f90398 (diff) | |
| download | git-27d7c8599b159862762e2bd121c22d516fb04e90.zip git-27d7c8599b159862762e2bd121c22d516fb04e90.tar.gz git-27d7c8599b159862762e2bd121c22d516fb04e90.tar.bz2 | |
Merge branch 'js/default-branch-name-tests-final-stretch'
Prepare tests not to be affected by the name of the default branch
"git init" creates.
* js/default-branch-name-tests-final-stretch: (28 commits)
tests: drop prereq `PREPARE_FOR_MAIN_BRANCH` where no longer needed
t99*: adjust the references to the default branch name "main"
tests(git-p4): transition to the default branch name `main`
t9[5-7]*: adjust the references to the default branch name "main"
t9[0-4]*: adjust the references to the default branch name "main"
t8*: adjust the references to the default branch name "main"
t7[5-9]*: adjust the references to the default branch name "main"
t7[0-4]*: adjust the references to the default branch name "main"
t6[4-9]*: adjust the references to the default branch name "main"
t64*: preemptively adjust alignment to prepare for `master` -> `main`
t6[0-3]*: adjust the references to the default branch name "main"
t5[6-9]*: adjust the references to the default branch name "main"
t55[4-9]*: adjust the references to the default branch name "main"
t55[23]*: adjust the references to the default branch name "main"
t551*: adjust the references to the default branch name "main"
t550*: adjust the references to the default branch name "main"
t5503: prepare aligned comment for replacing `master` with `main`
t5[0-4]*: adjust the references to the default branch name "main"
t5323: prepare centered comment for `master` -> `main`
t4*: adjust the references to the default branch name "main"
...
Diffstat (limited to 't/t1700-split-index.sh')
| -rwxr-xr-x | t/t1700-split-index.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/t/t1700-split-index.sh b/t/t1700-split-index.sh index 12a5568..986baa6 100755 --- a/t/t1700-split-index.sh +++ b/t/t1700-split-index.sh @@ -2,6 +2,9 @@ test_description='split index mode tests' +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main +export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME + . ./test-lib.sh # We need total control of index splitting here @@ -496,7 +499,7 @@ test_expect_success 'do not refresh null base index' ' test_commit initial && git checkout -b side-branch && test_commit extra && - git checkout master && + git checkout main && git update-index --split-index && test_commit more && # must not write a new shareindex, or we wont catch the problem |