Merge branch 'mw/sendemail'

diff --git a/t/t9102-git-svn-deep-rmdir.sh b/t/t9102-git-svn-deep-rmdir.sh
index d693d183c8e41a4c1e948e690f42a55c985543b3..e2232180158cfb0e523c8ffdd3ac10bf61c8f4ee 100755 (executable)
--- a/t/t9102-git-svn-deep-rmdir.sh
+++ b/t/t9102-git-svn-deep-rmdir.sh
@@ -1,29 +1,30 @@
-test_description='git-svn rmdir'
+#!/bin/sh
+test_description='git svn rmdir'
 . ./lib-git-svn.sh
 
-test_expect_success 'initialize repo' "
+test_expect_success 'initialize repo' '
        mkdir import &&
        cd import &&
        mkdir -p deeply/nested/directory/number/1 &&
        mkdir -p deeply/nested/directory/number/2 &&
        echo foo > deeply/nested/directory/number/1/file &&
        echo foo > deeply/nested/directory/number/2/another &&
-       svn import -m 'import for git-svn' . $svnrepo &&
+       svn import -m "import for git svn" . "$svnrepo" &&
        cd ..
-       "
+       '
 
-test_expect_success 'mirror via git-svn' "
-       git-svn init $svnrepo &&
-       git-svn fetch &&
-       git checkout -f -b test-rmdir remotes/git-svn
-       "
+test_expect_success 'mirror via git svn' '
+       git svn init "$svnrepo" &&
+       git svn fetch &&
+       git checkout -f -b test-rmdir ${remotes_git_svn}
+       '
 
-test_expect_success 'Try a commit on rmdir' "
+test_expect_success 'Try a commit on rmdir' '
        git rm -f deeply/nested/directory/number/2/another &&
-       git commit -a -m 'remove another' &&
-       git-svn commit --rmdir HEAD &&
-       svn ls -R $svnrepo | grep ^deeply/nested/directory/number/1
-       "
+       git commit -a -m "remove another" &&
+       git svn set-tree --rmdir HEAD &&
+       svn ls -R "$svnrepo" | grep ^deeply/nested/directory/number/1
+       '
 
 
 test_done