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/t9169-git-svn-dcommit-crlf.sh | |
| parent | t8*: adjust the references to the default branch name "main" (diff) | |
| download | git-a881baa2c31daa9f1d06a3b7b07054354a76dda9.tar.gz git-a881baa2c31daa9f1d06a3b7b07054354a76dda9.zip | |
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/t9169-git-svn-dcommit-crlf.sh')
| -rwxr-xr-x | t/t9169-git-svn-dcommit-crlf.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t9169-git-svn-dcommit-crlf.sh b/t/t9169-git-svn-dcommit-crlf.sh index 47ae51c54f..7080b5d24f 100755 --- a/t/t9169-git-svn-dcommit-crlf.sh +++ b/t/t9169-git-svn-dcommit-crlf.sh @@ -1,7 +1,7 @@ #!/bin/sh test_description='git svn dcommit CRLF' -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 @@ -17,7 +17,7 @@ test_expect_success 'setup commit repository' ' p=$(git rev-parse HEAD) && t=$(git write-tree) && cmt=$(git commit-tree -p $p $t <cmt) && - git update-ref refs/heads/master $cmt && + git update-ref refs/heads/main $cmt && git cat-file commit HEAD | tail -n4 >out && test_cmp cmt out && git svn dcommit && |