rewrite git_config() to use the config-set API

diff --git a/t/t9117-git-svn-init-clone.sh b/t/t9117-git-svn-init-clone.sh
index b7ef9e25895550e8749952e2ed54d7827737242e..a66f43c6b1a2d9194f87a17e1758f24018cf8b1b 100755 (executable)
--- a/t/t9117-git-svn-init-clone.sh
+++ b/t/t9117-git-svn-init-clone.sh
@@ -52,4 +52,71 @@ test_expect_success 'clone to target directory with --stdlayout' '
        rm -rf target
        '
 
+test_expect_success 'init without -s/-T/-b/-t does not warn' '
+       test ! -d trunk &&
+       git svn init "$svnrepo"/project/trunk trunk 2>warning &&
+       test_must_fail grep -q prefix warning &&
+       rm -rf trunk &&
+       rm -f warning
+       '
+
+test_expect_success 'clone without -s/-T/-b/-t does not warn' '
+       test ! -d trunk &&
+       git svn clone "$svnrepo"/project/trunk 2>warning &&
+       test_must_fail grep -q prefix warning &&
+       rm -rf trunk &&
+       rm -f warning
+       '
+
+test_svn_configured_prefix () {
+       prefix=$1 &&
+       cat >expect <<EOF &&
+project/trunk:refs/remotes/${prefix}trunk
+project/branches/*:refs/remotes/${prefix}*
+project/tags/*:refs/remotes/${prefix}tags/*
+EOF
+       test ! -f actual &&
+       git --git-dir=project/.git config svn-remote.svn.fetch >>actual &&
+       git --git-dir=project/.git config svn-remote.svn.branches >>actual &&
+       git --git-dir=project/.git config svn-remote.svn.tags >>actual &&
+       test_cmp expect actual &&
+       rm -f expect actual
+}
+
+test_expect_success 'init with -s/-T/-b/-t assumes --prefix=origin/' '
+       test ! -d project &&
+       git svn init -s "$svnrepo"/project project 2>warning &&
+       test_must_fail grep -q prefix warning &&
+       test_svn_configured_prefix "origin/" &&
+       rm -rf project &&
+       rm -f warning
+       '
+
+test_expect_success 'clone with -s/-T/-b/-t assumes --prefix=origin/' '
+       test ! -d project &&
+       git svn clone -s "$svnrepo"/project 2>warning &&
+       test_must_fail grep -q prefix warning &&
+       test_svn_configured_prefix "origin/" &&
+       rm -rf project &&
+       rm -f warning
+       '
+
+test_expect_success 'init with -s/-T/-b/-t and --prefix "" still works' '
+       test ! -d project &&
+       git svn init -s "$svnrepo"/project project --prefix "" 2>warning &&
+       test_must_fail grep -q prefix warning &&
+       test_svn_configured_prefix "" &&
+       rm -rf project &&
+       rm -f warning
+       '
+
+test_expect_success 'clone with -s/-T/-b/-t and --prefix "" still works' '
+       test ! -d project &&
+       git svn clone -s "$svnrepo"/project --prefix "" 2>warning &&
+       test_must_fail grep -q prefix warning &&
+       test_svn_configured_prefix "" &&
+       rm -rf project &&
+       rm -f warning
+       '
+
 test_done