mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t9[0-4]*: adjust the references to the default branch name "main"

Browse Source 
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:
Johannes Schindelin
2020-11-18 23:44:42 +00:00
committed by Junio C Hamano
parent 747f6c6805
commit a881baa2c3
16 changed files with 169 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
t/t9151-svn-mergeinfo.sh
View File

@ -5,7 +5,7 @@
test_description='git-svn svn mergeinfo properties'
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
@ -53,7 +53,7 @@ test_expect_success 'merging two branches in one commit is detected correctly' '
'
test_expect_failure 'everything got merged in the end' '
unmerged=$(git rev-list --all --not master) &&
unmerged=$(git rev-list --all --not main) &&
[ -z "$unmerged" ]
'