checkout -m path: fix recreating conflicts

diff --git a/t/t9120-git-svn-clone-with-percent-escapes.sh b/t/t9120-git-svn-clone-with-percent-escapes.sh
index 9a4eabe523c8560da9559b5c0ca6a951a027ca5d..ef2c0523cd4566b3d1c4925ba608efc16524546a 100755 (executable)
--- a/t/t9120-git-svn-clone-with-percent-escapes.sh
+++ b/t/t9120-git-svn-clone-with-percent-escapes.sh
@@ -3,16 +3,16 @@
 # Copyright (c) 2008 Kevin Ballard
 #
 
-test_description='git-svn clone with percent escapes'
+test_description='git svn clone with percent escapes'
 . ./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 &&
        start_httpd
-"
+'
 
 if test "$SVN_HTTPD_PORT" = ""
 then
@@ -21,7 +21,7 @@ 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 &&
+                       git rev-parse refs/${remotes_git_svn} &&
                cd ..
        '
 fi