Merge branch 'ib/t3700-add-chmod-x-updates' into tg/add-chmod+x-fix

diff --git a/t/t9120-git-svn-clone-with-percent-escapes.sh b/t/t9120-git-svn-clone-with-percent-escapes.sh
index 9d9ebd533cbcbcfc1e23be51bad1e63f4f08c53b..59465b147eb9cdc7da1fb891ff695cbc4442209a 100755 (executable)
--- a/t/t9120-git-svn-clone-with-percent-escapes.sh
+++ b/t/t9120-git-svn-clone-with-percent-escapes.sh
@@ -20,9 +20,10 @@ test_expect_success 'setup svnrepo' '
 
 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 ..
+       (
+               cd clone &&
+               git rev-parse refs/remotes/git-svn
+       )
 '
 
 # SVN works either way, so should we...
@@ -41,7 +42,7 @@ 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}
+               git rev-parse refs/remotes/git-svn
        )
 '
 
@@ -49,7 +50,7 @@ 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}
+               git rev-parse refs/remotes/git-svn
        )
 '
 
@@ -57,19 +58,19 @@ 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
+               git rev-parse refs/remotes/origin/trunk^0 &&
+               git rev-parse refs/remotes/origin/b^0 &&
+               git rev-parse refs/remotes/origin/tags/v1^0
        )
 '
 
 test_expect_success 'test clone -s with unescaped space' '
-       git svn clone -s "$svnrepo/pr ject" space &&
+       git svn clone -s "$svnrepo/pr ject" --prefix origin/ 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
+               git rev-parse refs/remotes/origin/trunk^0 &&
+               git rev-parse refs/remotes/origin/b^0 &&
+               git rev-parse refs/remotes/origin/tags/v1^0
        )
 '