diff options
| author |  Johannes Schindelin <johannes.schindelin@gmx.de> | 2020-11-18 23:44:35 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-11-19 15:44:18 -0800 |
| commit | 95cf2c01875fd66421d3551e9e86db435523575d (patch) | |
| tree | 93b27344f9fac7d11a5bd27b849a13cde5b246d9 /t/t5601-clone.sh | |
| parent | t55[4-9]*: adjust the references to the default branch name "main" (diff) | |
| download | tgif-95cf2c01875fd66421d3551e9e86db435523575d.tar.xz | |
t5[6-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' -- t5[6-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/t5601-clone.sh')
| -rwxr-xr-x | t/t5601-clone.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t5601-clone.sh b/t/t5601-clone.sh index e01c5fe02d..664c913866 100755 --- a/t/t5601-clone.sh +++ b/t/t5601-clone.sh @@ -2,7 +2,7 @@ test_description=clone -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh @@ -220,7 +220,7 @@ test_expect_success 'clone respects global branch.autosetuprebase' ' rm -fr dst && git clone src dst && cd dst && - actual="z$(git config branch.master.rebase)" && + actual="z$(git config branch.main.rebase)" && test ztrue = $actual ) ' @@ -594,7 +594,7 @@ test_expect_success 'clone from a repository with two identical branches' ' ( cd src && - git checkout -b another master + git checkout -b another main ) && git clone src target-11 && test "z$( cd target-11 && git symbolic-ref HEAD )" = zrefs/heads/another |