Merge branch 'maint'

diff --git a/t/t9118-git-svn-funky-branch-names.sh b/t/t9118-git-svn-funky-branch-names.sh
index 640bb066f380d6306ebb76e3dedf38c60cfab0b5..3281cbd3472a8da58c4f6f0f3965b5810705b0e9 100755 (executable)
--- a/t/t9118-git-svn-funky-branch-names.sh
+++ b/t/t9118-git-svn-funky-branch-names.sh
@@ -6,25 +6,25 @@
 test_description='git-svn funky branch names'
 . ./lib-git-svn.sh
 
-test_expect_success 'setup svnrepo' "
+test_expect_success 'setup svnrepo' '
        mkdir project project/trunk project/branches project/tags &&
        echo foo > project/trunk/foo &&
-       svn import -m '$test_description' project \"$svnrepo/pr ject\" &&
+       svn import -m "$test_description" project "$svnrepo/pr ject" &&
        rm -rf project &&
-       svn cp -m 'fun' \"$svnrepo/pr ject/trunk\" \
-                       \"$svnrepo/pr ject/branches/fun plugin\" &&
-       svn cp -m 'more fun!' \"$svnrepo/pr ject/branches/fun plugin\" \
-                             \"$svnrepo/pr ject/branches/more fun plugin!\" &&
+       svn cp -m "fun" "$svnrepo/pr ject/trunk" \
+                       "$svnrepo/pr ject/branches/fun plugin" &&
+       svn cp -m "more fun!" "$svnrepo/pr ject/branches/fun plugin" \
+                             "$svnrepo/pr ject/branches/more fun plugin!" &&
        start_httpd
-       "
+       '
 
-test_expect_success 'test clone with funky branch names' "
-       git svn clone -s \"$svnrepo/pr ject\" project &&
+test_expect_success 'test clone with funky branch names' '
+       git svn clone -s "$svnrepo/pr ject" project &&
        cd project &&
-               git rev-parse 'refs/remotes/fun%20plugin' &&
-               git rev-parse 'refs/remotes/more%20fun%20plugin!' &&
+               git rev-parse "refs/remotes/fun%20plugin" &&
+               git rev-parse "refs/remotes/more%20fun%20plugin!" &&
        cd ..
-       "
+       '
 
 test_expect_success 'test dcommit to funky branch' "
        cd project &&