diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2020-11-18 23:44:38 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-19 15:44:18 -0800 |
| commit | 5902f5f4608c1857fc04dcae2a0ce6beea31c8f8 (patch) | |
| tree | 9a56000f293ef84871a419a00bb7a3abdcda6706 /t/t6414-merge-rename-nocruft.sh | |
| parent | 1f53df54eba378eee544b47f7c9e7f5fc32873e1 (diff) | |
| download | git-5902f5f4608c1857fc04dcae2a0ce6beea31c8f8.tar.gz | |
t6[4-9]*: adjust the references to the default branch name "main"
This trick was performed via
$ (cd t &&
sed -i -e 's/master/main/g' -e 's/MASTER/MAIN/g' \
-e 's/Master/Main/g' -- t6[4-9]*.sh)
This allows us to define `GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main`
for those tests.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6414-merge-rename-nocruft.sh')
| -rwxr-xr-x | t/t6414-merge-rename-nocruft.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t6414-merge-rename-nocruft.sh b/t/t6414-merge-rename-nocruft.sh index 42824dcf49..d7e3c1fa6e 100755 --- a/t/t6414-merge-rename-nocruft.sh +++ b/t/t6414-merge-rename-nocruft.sh @@ -1,7 +1,7 @@ #!/bin/sh test_description='Merge-recursive merging renames' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh @@ -68,7 +68,7 @@ test_expect_success 'setup' ' git update-index A && git commit -m "blue modify A" && - git checkout master + git checkout main ' # This test broke in 65ac6e9c3f47807cb603af07a6a9e1a43bc119ae |