diff options
author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2020-11-18 23:44:38 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-11-19 23:44:18 (GMT) |
commit | 5902f5f4608c1857fc04dcae2a0ce6beea31c8f8 (patch) | |
tree | 9a56000f293ef84871a419a00bb7a3abdcda6706 /t/t6411-merge-filemode.sh | |
parent | 1f53df54eba378eee544b47f7c9e7f5fc32873e1 (diff) | |
download | git-5902f5f4608c1857fc04dcae2a0ce6beea31c8f8.zip git-5902f5f4608c1857fc04dcae2a0ce6beea31c8f8.tar.gz git-5902f5f4608c1857fc04dcae2a0ce6beea31c8f8.tar.bz2 |
t6[4-9]*: adjust the references to the default branch name "main"
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>
Diffstat (limited to 't/t6411-merge-filemode.sh')
-rwxr-xr-x | t/t6411-merge-filemode.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/t/t6411-merge-filemode.sh b/t/t6411-merge-filemode.sh index 7b66abf..f54c915 100755 --- a/t/t6411-merge-filemode.sh +++ b/t/t6411-merge-filemode.sh @@ -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 ' |