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

t6[4-9]*: 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' -- t6[4-9]*.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:38 +00:00
committed by Junio C Hamano
parent 1f53df54eb
commit 5902f5f460
27 changed files with 190 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
t/t6437-submodule-merge.sh
View File

@ -2,7 +2,7 @@
test_description='merging with submodules'
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
. ./test-lib.sh
@ -30,7 +30,7 @@ test_expect_success setup '
test_tick &&
git commit -m root &&
git checkout -b a master &&
git checkout -b a main &&
(cd sub &&
echo A > file &&
git add file &&
@ -40,7 +40,7 @@ test_expect_success setup '
test_tick &&
git commit -m a &&
git checkout -b b master &&
git checkout -b b main &&
(cd sub &&
echo B > file &&
git add file &&
@ -257,22 +257,22 @@ test_expect_success 'setup for recursive merge with submodule' '
(cd sub &&
git init &&
test_commit a &&
git checkout -b sub-b master &&
git checkout -b sub-b main &&
test_commit b &&
git checkout -b sub-c master &&
git checkout -b sub-c main &&
test_commit c &&
git checkout -b sub-bc sub-b &&
git merge sub-c &&
git checkout -b sub-cb sub-c &&
git merge sub-b &&
git checkout master) &&
git checkout main) &&
git add sub &&
git commit -m a &&
git checkout -b top-b master &&
git checkout -b top-b main &&
(cd sub && git checkout sub-b) &&
git add sub &&
git commit -m b &&
git checkout -b top-c master &&
git checkout -b top-c main &&
(cd sub && git checkout sub-c) &&
git add sub &&
git commit -m c &&