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

8
t/t6434-merge-recursive-rename-options.sh
View File

@ -5,11 +5,11 @@ test_description='merge-recursive rename options
Test rename detection by examining rename/delete conflicts.
* (HEAD -> rename) rename
| * (master) delete
| * (main) delete
|/
* base
git diff --name-status base master
git diff --name-status base main
D 0-old
D 1-old
D 2-old
@ -26,7 +26,7 @@ they are rounded down (see, e.g., Documentation/diff-generate-patch.txt, which
mentions this in a different context).
'
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
. ./test-lib.sh
@ -121,7 +121,7 @@ test_expect_success 'setup repo' '
get_expected_stages 2 &&
get_expected_stages 3 &&
check_50="false" &&
tail="HEAD^ -- HEAD master"
tail="HEAD^ -- HEAD main"
'
test_expect_success 'setup thresholds' '