Merge branch 'master' of git://git.kernel.org/pub/scm/gitk/gitk

diff --git a/t/t9110-git-svn-use-svm-props.sh b/t/t9110-git-svn-use-svm-props.sh
index 9db0d8fd8d36c5762e436e237575d24eb1699dde..59e17f266374c837f0c1e0bd0a4a40fe22a773a6 100755 (executable)
--- a/t/t9110-git-svn-use-svm-props.sh
+++ b/t/t9110-git-svn-use-svm-props.sh
@@ -9,9 +9,10 @@ test_description='git-svn useSvmProps test'
 
 test_expect_success 'load svm repo' "
        svnadmin load -q $rawsvnrepo < ../t9110/svm.dump &&
-       git-svn init -R arr -i bar $svnrepo/mirror/arr &&
-       git-svn init -R argh -i dir $svnrepo/mirror/argh &&
-       git-svn init -R argh -i e $svnrepo/mirror/argh/a/b/c/d/e &&
+       git-svn init --minimize-url -R arr -i bar $svnrepo/mirror/arr &&
+       git-svn init --minimize-url -R argh -i dir $svnrepo/mirror/argh &&
+       git-svn init --minimize-url -R argh -i e \
+         $svnrepo/mirror/argh/a/b/c/d/e &&
        git-config svn.useSvmProps true &&
        git-svn fetch --all
        "