Merge branch 'ar/wildcardpush'

diff --git a/t/t9107-git-svn-migrate.sh b/t/t9107-git-svn-migrate.sh
index d26c355f059009ee0a57be07af1636ab47c11b12..d549665400a2eccffec0689865a1e9fdcc034985 100755 (executable)
--- a/t/t9107-git-svn-migrate.sh
+++ b/t/t9107-git-svn-migrate.sh
@@ -17,6 +17,7 @@ test_expect_success 'setup old-looking metadata' "
        git-svn init $svnrepo &&
        git-svn fetch &&
        mv $GIT_DIR/svn/* $GIT_DIR/ &&
+       mv $GIT_DIR/svn/.metadata $GIT_DIR/ &&
        rmdir $GIT_DIR/svn &&
        git-update-ref refs/heads/git-svn-HEAD refs/remotes/git-svn &&
        git-update-ref refs/heads/svn-HEAD refs/remotes/git-svn &&
@@ -40,7 +41,7 @@ test_expect_success 'initialize old-style (v0) git-svn layout' "
        "
 
 test_expect_success 'initialize a multi-repository repo' "
-       git-svn multi-init $svnrepo -T trunk -t tags -b branches &&
+       git-svn init $svnrepo -T trunk -t tags -b branches &&
        git-config --get-all svn-remote.svn.fetch > fetch.out &&
        grep '^trunk:refs/remotes/trunk$' fetch.out &&
        test -n \"\`git-config --get svn-remote.svn.branches \
@@ -72,7 +73,7 @@ test_expect_success 'multi-fetch works on partial urls + paths' "
                                 refs/remotes/\$j\`\" ||exit 1; done; done
        "
 
-test_expect_success 'migrate --minimize on old multi-inited layout' "
+test_expect_success 'migrate --minimize on old inited layout' "
        git config --unset-all svn-remote.svn.fetch &&
        git config --unset-all svn-remote.svn.url &&
        rm -rf $GIT_DIR/svn &&
@@ -108,4 +109,3 @@ test_expect_success  ".rev_db auto-converted to .rev_db.UUID" "
        "
 
 test_done
-