admin/git
1
0
Fork 0
Code Issues Pull Requests Actions 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

8
t/t6407-merge-binary.sh
View File

@@ -2,7 +2,7 @@
test_description='ask merge-recursive to merge binary files'
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
. ./test-lib.sh
@@ -23,7 +23,7 @@ test_expect_success setup '
git ls-files -s a >E0 &&
git ls-files -s m | sed -e "s/ 0 / 3 /" >E3 &&
test_tick &&
git commit -m "master adds some" &&
git commit -m "main adds some" &&
git checkout side &&
echo rezrov >>m &&
@@ -42,7 +42,7 @@ test_expect_success resolve '
rm -f a* m* &&
git reset --hard anchor &&
if git merge -s resolve master
if git merge -s resolve main
then
echo Oops, should not have succeeded
false
@@ -57,7 +57,7 @@ test_expect_success recursive '
rm -f a* m* &&
git reset --hard anchor &&
if git merge -s recursive master
if git merge -s recursive main
then
echo Oops, should not have succeeded
false