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

12
t/t6411-merge-filemode.sh
View File

@@ -1,7 +1,7 @@
#!/bin/sh
test_description='merge: handle file mode'
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
. ./test-lib.sh
@@ -10,11 +10,11 @@ test_expect_success 'set up mode change in one branch' '
: >file1 &&
git add file1 &&
git commit -m initial &&
git checkout -b a1 master &&
git checkout -b a1 main &&
: >dummy &&
git add dummy &&
git commit -m a &&
git checkout -b b1 master &&
git checkout -b b1 main &&
test_chmod +x file1 &&
git add file1 &&
git commit -m b1
@@ -42,12 +42,12 @@ do_one_mode resolve b1 a1
test_expect_success 'set up mode change in both branches' '
git reset --hard HEAD &&
git checkout -b a2 master &&
git checkout -b a2 main &&
: >file2 &&
H=$(git hash-object file2) &&
test_chmod +x file2 &&
git commit -m a2 &&
git checkout -b b2 master &&
git checkout -b b2 main &&
: >file2 &&
git add file2 &&
git commit -m b2 &&
@@ -79,7 +79,7 @@ do_both_modes resolve
test_expect_success 'set up delete/modechange scenario' '
git reset --hard &&
git checkout -b deletion master &&
git checkout -b deletion main &&
git rm file1 &&
git commit -m deletion
'