diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2020-11-18 23:44:42 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-19 23:44:18 (GMT) |
| commit | a881baa2c31daa9f1d06a3b7b07054354a76dda9 (patch) | |
| tree | 93f3e5e35ed97dba31573371d7265f6b32b9f2d0 /t/t9145-git-svn-master-branch.sh | |
| parent | 747f6c6805c442cc74608743d14a1a47a3b1afa8 (diff) | |
| download | git-a881baa2c31daa9f1d06a3b7b07054354a76dda9.zip git-a881baa2c31daa9f1d06a3b7b07054354a76dda9.tar.gz git-a881baa2c31daa9f1d06a3b7b07054354a76dda9.tar.bz2 | |
t9[0-4]*: 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' -- t9[0-4]*.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/t9145-git-svn-master-branch.sh')
| -rwxr-xr-x | t/t9145-git-svn-master-branch.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t9145-git-svn-master-branch.sh b/t/t9145-git-svn-master-branch.sh index 053571c..f863e43 100755 --- a/t/t9145-git-svn-master-branch.sh +++ b/t/t9145-git-svn-master-branch.sh @@ -2,8 +2,8 @@ # # Copyright (c) 2009 Eric Wong # -test_description='git svn initial master branch is "trunk" if possible' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +test_description='git svn initial main branch is "trunk" if possible' +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./lib-git-svn.sh @@ -16,12 +16,12 @@ test_expect_success 'setup test repository' ' svn_cmd import -m b/b i "$svnrepo/branches/b" ' -test_expect_success 'git svn clone --stdlayout sets up trunk as master' ' +test_expect_success 'git svn clone --stdlayout sets up trunk as main' ' git svn clone -s "$svnrepo" g && ( cd g && test x$(git rev-parse --verify refs/remotes/origin/trunk^0) = \ - x$(git rev-parse --verify refs/heads/master^0) + x$(git rev-parse --verify refs/heads/main^0) ) ' |