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

16
t/t9301-fast-import-notes.sh
View File

@ -4,7 +4,7 @@
#
test_description='test git fast-import of notes objects'
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
. ./test-lib.sh
@ -12,7 +12,7 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
test_tick
cat >input <<INPUT_END
commit refs/heads/master
commit refs/heads/main
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
data <<COMMIT
first commit
@ -33,7 +33,7 @@ data <<EOF
file baz/xyzzy in first commit
EOF
commit refs/heads/master
commit refs/heads/main
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
data <<COMMIT
second commit
@ -49,7 +49,7 @@ data <<EOF
file baz/xyzzy in second commit
EOF
commit refs/heads/master
commit refs/heads/main
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
data <<COMMIT
third commit
@ -60,7 +60,7 @@ data <<EOF
file foo in third commit
EOF
commit refs/heads/master
commit refs/heads/main
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
data <<COMMIT
fourth commit
@ -73,13 +73,13 @@ EOF
INPUT_END
test_expect_success 'set up master branch' '
test_expect_success 'set up main branch' '
git fast-import <input &&
git whatchanged master
git whatchanged main
'
commit4=$(git rev-parse refs/heads/master)
commit4=$(git rev-parse refs/heads/main)
commit3=$(git rev-parse "$commit4^")
commit2=$(git rev-parse "$commit4~2")
commit1=$(git rev-parse "$commit4~3")