Sync with 1.7.5.1

diff --git a/t/t9146-git-svn-empty-dirs.sh b/t/t9146-git-svn-empty-dirs.sh
index 3f2d7198270f0ad4bcb4d1082a0b452e37a53f05..6d3130e61856335dff7004903741a490ae94fc08 100755 (executable)
--- a/t/t9146-git-svn-empty-dirs.sh
+++ b/t/t9146-git-svn-empty-dirs.sh
@@ -28,12 +28,29 @@ test_expect_success 'empty directories exist' '
        )
 '
 
+test_expect_success 'option automkdirs set to false' '
+       (
+               git svn init "$svnrepo" cloned-no-mkdirs &&
+               cd cloned-no-mkdirs &&
+               git config svn-remote.svn.automkdirs false &&
+               git svn fetch &&
+               for i in a b c d d/e d/e/f "weird file name"
+               do
+                       if test -d "$i"
+                       then
+                               echo >&2 "$i exists"
+                               exit 1
+                       fi
+               done
+       )
+'
+
 test_expect_success 'more emptiness' '
        svn_cmd mkdir -m "bang bang"  "$svnrepo"/"! !"
 '
 
 test_expect_success 'git svn rebase creates empty directory' '
-       ( cd cloned && git svn rebase )
+       ( cd cloned && git svn rebase ) &&
        test -d cloned/"! !"
 '
 
@@ -122,7 +139,7 @@ test_expect_success 'git svn gc-ed files work' '
                : Compress::Zlib may not be available &&
                if test -f "$unhandled".gz
                then
-                       svn mkdir -m gz "$svnrepo"/gz &&
+                       svn_cmd mkdir -m gz "$svnrepo"/gz &&
                        git reset --hard $(git rev-list HEAD | tail -1) &&
                        git svn rebase &&
                        test -f "$unhandled".gz &&