diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2020-11-18 23:44:42 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-19 15:44:18 -0800 |
| commit | a881baa2c31daa9f1d06a3b7b07054354a76dda9 (patch) | |
| tree | 93f3e5e35ed97dba31573371d7265f6b32b9f2d0 /t/t9163-git-svn-reset-clears-caches.sh | |
| parent | 747f6c6805c442cc74608743d14a1a47a3b1afa8 (diff) | |
| download | git-a881baa2c31daa9f1d06a3b7b07054354a76dda9.tar.gz | |
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/t9163-git-svn-reset-clears-caches.sh')
| -rwxr-xr-x | t/t9163-git-svn-reset-clears-caches.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t9163-git-svn-reset-clears-caches.sh b/t/t9163-git-svn-reset-clears-caches.sh index e48faf92af..978eb62ff4 100755 --- a/t/t9163-git-svn-reset-clears-caches.sh +++ b/t/t9163-git-svn-reset-clears-caches.sh @@ -4,7 +4,7 @@ # test_description='git svn reset clears memoized caches' -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 @@ -62,7 +62,7 @@ test_expect_success 'fetch to merge-base (a)' ' test_expect_success 'rebase looses SVN merge (m)' ' git svn rebase && git svn fetch && - test 1 = $(git cat-file -p master|grep parent|wc -l) + test 1 = $(git cat-file -p main|grep parent|wc -l) ' # git svn fetch creates correct history with merge commit |