summaryrefslogtreecommitdiff
path: root/t/t7403-submodule-sync.sh
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2020-11-18 23:44:39 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-11-19 23:44:18 (GMT)
commit01dc81336dc10c8f2350454c755a8a0ab676a9c9 (patch)
tree74230ac15a70592c4178ba53ceef337f5730dd2d /t/t7403-submodule-sync.sh
parent5902f5f4608c1857fc04dcae2a0ce6beea31c8f8 (diff)
downloadgit-01dc81336dc10c8f2350454c755a8a0ab676a9c9.zip
git-01dc81336dc10c8f2350454c755a8a0ab676a9c9.tar.gz
git-01dc81336dc10c8f2350454c755a8a0ab676a9c9.tar.bz2
t7[0-4]*: adjust the references to the default branch name "main"
Carefully excluding t7064, which sees independent development elsewhere at the time of writing, we use `main` as the default branch name in t7[0-4]*. This trick was performed via $ (cd t && sed -i -e 's/master/main/g' -e 's/MASTER/MAIN/g' \ -e 's/Master/Main/g' -- t7[0-4]*.sh && git checkout HEAD -- t7064\*) 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/t7403-submodule-sync.sh')
-rwxr-xr-xt/t7403-submodule-sync.sh12
1 files changed, 6 insertions, 6 deletions
diff --git a/t/t7403-submodule-sync.sh b/t/t7403-submodule-sync.sh
index c95559b..7d2ac33 100755
--- a/t/t7403-submodule-sync.sh
+++ b/t/t7403-submodule-sync.sh
@@ -8,7 +8,7 @@ test_description='git submodule sync
These tests exercise the "git submodule sync" subcommand.
'
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
. ./test-lib.sh
@@ -81,7 +81,7 @@ test_expect_success 'change submodule url' '
(
cd super &&
cd submodule &&
- git checkout master &&
+ git checkout main &&
git pull
) &&
mv submodule moved-submodule &&
@@ -115,7 +115,7 @@ test_expect_success '"git submodule sync" should update submodule URLs' '
)" &&
(
cd super-clone/submodule &&
- git checkout master &&
+ git checkout main &&
git pull
) &&
(
@@ -143,7 +143,7 @@ test_expect_success '"git submodule sync --recursive" should update all submodul
)" &&
(
cd super-clone/submodule/sub-submodule &&
- git checkout master &&
+ git checkout main &&
git pull
)
'
@@ -171,7 +171,7 @@ test_expect_success '"git submodule sync" should update submodule URLs - subdire
)" &&
(
cd super-clone/submodule &&
- git checkout master &&
+ git checkout main &&
git pull
) &&
(
@@ -202,7 +202,7 @@ test_expect_success '"git submodule sync --recursive" should update all submodul
)" &&
(
cd super-clone/submodule/sub-submodule &&
- git checkout master &&
+ git checkout main &&
git pull
)
'