fmt-merge-msg: minor refactor of fmt_merge_msg()

diff --git a/t/t9120-git-svn-clone-with-percent-escapes.sh b/t/t9120-git-svn-clone-with-percent-escapes.sh
index ef2c0523cd4566b3d1c4925ba608efc16524546a..9d9ebd533cbcbcfc1e23be51bad1e63f4f08c53b 100755 (executable)
--- a/t/t9120-git-svn-clone-with-percent-escapes.sh
+++ b/t/t9120-git-svn-clone-with-percent-escapes.sh
@@ -9,22 +9,69 @@ test_description='git svn clone with percent escapes'
 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_cmd import -m "$test_description" project "$svnrepo/pr ject" &&
+       svn_cmd cp -m "branch" "$svnrepo/pr ject/trunk" \
+         "$svnrepo/pr ject/branches/b" &&
+       svn_cmd cp -m "tag" "$svnrepo/pr ject/trunk" \
+         "$svnrepo/pr ject/tags/v1" &&
        rm -rf project &&
        start_httpd
 '
 
-if test "$SVN_HTTPD_PORT" = ""
-then
-       test_expect_failure 'test clone with percent escapes - needs SVN_HTTPD_PORT set' 'false'
-else
-       test_expect_success 'test clone with percent escapes' '
-               git svn clone "$svnrepo/pr%20ject" clone &&
-               cd clone &&
-                       git rev-parse refs/${remotes_git_svn} &&
-               cd ..
-       '
-fi
+test_expect_success 'test clone with percent escapes' '
+       git svn clone "$svnrepo/pr%20ject" clone &&
+       cd clone &&
+               git rev-parse refs/${remotes_git_svn} &&
+       cd ..
+'
+
+# SVN works either way, so should we...
+
+test_expect_success 'svn checkout with percent escapes' '
+       svn_cmd checkout "$svnrepo/pr%20ject" svn.percent &&
+       svn_cmd checkout "$svnrepo/pr%20ject/trunk" svn.percent.trunk
+'
+
+test_expect_success 'svn checkout with space' '
+       svn_cmd checkout "$svnrepo/pr ject" svn.space &&
+       svn_cmd checkout "$svnrepo/pr ject/trunk" svn.space.trunk
+'
+
+test_expect_success 'test clone trunk with percent escapes and minimize-url' '
+       git svn clone --minimize-url "$svnrepo/pr%20ject/trunk" minimize &&
+       (
+               cd minimize &&
+               git rev-parse refs/${remotes_git_svn}
+       )
+'
+
+test_expect_success 'test clone trunk with percent escapes' '
+       git svn clone "$svnrepo/pr%20ject/trunk" trunk &&
+       (
+               cd trunk &&
+               git rev-parse refs/${remotes_git_svn}
+       )
+'
+
+test_expect_success 'test clone --stdlayout with percent escapes' '
+       git svn clone --stdlayout "$svnrepo/pr%20ject" percent &&
+       (
+               cd percent &&
+               git rev-parse refs/remotes/trunk^0 &&
+               git rev-parse refs/remotes/b^0 &&
+               git rev-parse refs/remotes/tags/v1^0
+       )
+'
+
+test_expect_success 'test clone -s with unescaped space' '
+       git svn clone -s "$svnrepo/pr ject" space &&
+       (
+               cd space &&
+               git rev-parse refs/remotes/trunk^0 &&
+               git rev-parse refs/remotes/b^0 &&
+               git rev-parse refs/remotes/tags/v1^0
+       )
+'
 
 stop_httpd