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>
This commit is contained in:

committed by
Junio C Hamano

parent
747f6c6805
commit
a881baa2c3
@ -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)
|
||||
)
|
||||
'
|
||||
|
||||
|
Reference in New Issue
Block a user