Merge git://repo.or.cz/git-gui

diff --git a/t/t9105-git-svn-commit-diff.sh b/t/t9105-git-svn-commit-diff.sh
index c668dd127082ab400acd505e4970fb6f9cdbad1b..318e172ef5e8f20d3552f272c6c256f5c2677c68 100755 (executable)
--- a/t/t9105-git-svn-commit-diff.sh
+++ b/t/t9105-git-svn-commit-diff.sh
@@ -33,7 +33,7 @@ test_expect_success 'test the commit-diff command' "
 
 test_expect_success 'commit-diff to a sub-directory (with git-svn config)' "
        svn import -m 'sub-directory' import $svnrepo/subdir &&
-       git-svn init $svnrepo/subdir &&
+       git-svn init --minimize-url $svnrepo/subdir &&
        git-svn fetch &&
        git-svn commit-diff -r3 '$prev' '$head' &&
        svn cat $svnrepo/subdir/readme > readme.2 &&