testsvn: respect init.defaultBranch

The default name of the initial branch in new repositories can now be
configured. The `testsvn` remote helper translates the remote Subversion
repository's branch name `trunk` to the hard-coded name `master`.
Clearly, the intention was to make the name align with Git's defaults.

So while we are not talking about a newly-created repository in the
`testsvn` context, it is a newly-created _Git_ repository, si it _still_
makes sense to use the overridden default name for the initial branch
whenever users configured it.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Johannes Schindelin
2020-06-24 14:46:36 +00:00
committed by Junio C Hamano
parent a471214bd6
commit 0068f2116e
2 changed files with 13 additions and 3 deletions

View File

@ -84,6 +84,12 @@ test_expect_success REMOTE_SVN 'incremental imports must lead to the same head'
test_cmp master.good .git/refs/remotes/svnsim/master
'
test_expect_success REMOTE_SVN 'respects configured default initial branch' '
git -c init.defaultBranch=trunk remote add -f trunk \
"testsvn::file://$TEST_DIRECTORY/t9154/svn.dump" &&
git rev-parse --verify refs/remotes/trunk/trunk
'
test_debug 'git branch -a'
test_done