summaryrefslogtreecommitdiff
path: root/t/t9156-git-svn-fetch-deleted-tag-2.sh
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2020-11-18 23:44:42 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-11-19 23:44:18 (GMT)
commita881baa2c31daa9f1d06a3b7b07054354a76dda9 (patch)
tree93f3e5e35ed97dba31573371d7265f6b32b9f2d0 /t/t9156-git-svn-fetch-deleted-tag-2.sh
parent747f6c6805c442cc74608743d14a1a47a3b1afa8 (diff)
downloadgit-a881baa2c31daa9f1d06a3b7b07054354a76dda9.zip
git-a881baa2c31daa9f1d06a3b7b07054354a76dda9.tar.gz
git-a881baa2c31daa9f1d06a3b7b07054354a76dda9.tar.bz2
t9[0-4]*: 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' -- t9[0-4]*.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/t9156-git-svn-fetch-deleted-tag-2.sh')
-rwxr-xr-xt/t9156-git-svn-fetch-deleted-tag-2.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t9156-git-svn-fetch-deleted-tag-2.sh b/t/t9156-git-svn-fetch-deleted-tag-2.sh
index ba78bfb6..2b75c40 100755
--- a/t/t9156-git-svn-fetch-deleted-tag-2.sh
+++ b/t/t9156-git-svn-fetch-deleted-tag-2.sh
@@ -2,7 +2,7 @@
test_description='git svn fetch deleted tag 2'
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
. ./lib-git-svn.sh
@@ -39,9 +39,9 @@ test_expect_success 'fetch deleted tags from same revision with no checksum erro
cd git_project &&
git svn fetch &&
- git diff --exit-code master:subdir3/file origin/tags/mytag:file &&
- git diff --exit-code master:subdir2/file origin/tags/mytag^:file &&
- git diff --exit-code master:subdir1/file origin/tags/mytag^^:file
+ git diff --exit-code main:subdir3/file origin/tags/mytag:file &&
+ git diff --exit-code main:subdir2/file origin/tags/mytag^:file &&
+ git diff --exit-code main:subdir1/file origin/tags/mytag^^:file
'
test_done