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
@ -6,7 +6,7 @@
|
||||
test_description='git svn basic tests'
|
||||
GIT_SVN_LC_ALL=${LC_ALL:-$LANG}
|
||||
|
||||
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
|
||||
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
||||
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
||||
|
||||
. ./lib-git-svn.sh
|
||||
@ -278,7 +278,7 @@ test_expect_success 'dcommit $rev does not clobber current branch' '
|
||||
test refs/heads/my-bar = $(git symbolic-ref HEAD) &&
|
||||
git log refs/remotes/bar | grep "change 1" &&
|
||||
! git log refs/remotes/bar | grep "change 2" &&
|
||||
git checkout master &&
|
||||
git checkout main &&
|
||||
git branch -D my-bar
|
||||
'
|
||||
|
||||
|
Reference in New Issue
Block a user