Merge branch 'maint'

diff --git a/t/lib-git-svn.sh b/t/lib-git-svn.sh
index 56549623430ca6bea2de35bbae7d2d211720da3b..fd8631f90686bb4dfe6d39290434136fc4741068 100644 (file)
--- a/t/lib-git-svn.sh
+++ b/t/lib-git-svn.sh
@@ -14,7 +14,7 @@ if ! test_have_prereq PERL; then
 fi
 
 GIT_DIR=$PWD/.git
-GIT_SVN_DIR=$GIT_DIR/svn/git-svn
+GIT_SVN_DIR=$GIT_DIR/svn/refs/remotes/git-svn
 SVN_TREE=$GIT_SVN_DIR/svn-tree
 
 svn >/dev/null 2>&1