test prerequisites: eradicate NOT_FOO

diff --git a/t/t9118-git-svn-funky-branch-names.sh b/t/t9118-git-svn-funky-branch-names.sh
index 63fc982c8cdbd9c19eb06bba58ad5e86da5dd03e..ed4d1369cca6a232cdb7ed98fc75b074a808e46e 100755 (executable)
--- a/t/t9118-git-svn-funky-branch-names.sh
+++ b/t/t9118-git-svn-funky-branch-names.sh
@@ -28,28 +28,33 @@ test_expect_success 'setup svnrepo' '
        svn_cmd cp -m "trailing .lock" "$svnrepo/pr ject/trunk" \
                        "$svnrepo/pr ject/branches/trailing_dotlock.lock" &&
        svn_cmd cp -m "reflog" "$svnrepo/pr ject/trunk" \
-                       "$svnrepo/pr ject/branches/not-a%40{0}reflog" &&
+                       "$svnrepo/pr ject/branches/not-a@{0}reflog@" &&
        start_httpd
        '
 
+# SVN 1.7 will truncate "not-a%40{0]" to just "not-a".
+# Look at what SVN wound up naming the branch and use that.
+# Be sure to escape the @ if it shows up.
+non_reflog=`svn_cmd ls "$svnrepo/pr ject/branches" | grep not-a | sed 's/\///' | sed 's/@/%40/'`
+
 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/$scary_ref" &&
-               git rev-parse "refs/remotes/%2Eleading_dot" &&
-               git rev-parse "refs/remotes/trailing_dot%2E" &&
-               git rev-parse "refs/remotes/trailing_dotlock%2Elock" &&
-               git rev-parse "refs/remotes/not-a%40{0}reflog"
+               git rev-parse "refs/remotes/origin/fun%20plugin" &&
+               git rev-parse "refs/remotes/origin/more%20fun%20plugin!" &&
+               git rev-parse "refs/remotes/origin/$scary_ref" &&
+               git rev-parse "refs/remotes/origin/%2Eleading_dot" &&
+               git rev-parse "refs/remotes/origin/trailing_dot%2E" &&
+               git rev-parse "refs/remotes/origin/trailing_dotlock%2Elock" &&
+               git rev-parse "refs/remotes/origin/$non_reflog"
        )
        '
 
 test_expect_success 'test dcommit to funky branch' "
        (
                cd project &&
-               git reset --hard 'refs/remotes/more%20fun%20plugin!' &&
+               git reset --hard 'refs/remotes/origin/more%20fun%20plugin!' &&
                echo hello >> foo &&
                git commit -m 'hello' -- foo &&
                git svn dcommit
@@ -59,7 +64,7 @@ test_expect_success 'test dcommit to funky branch' "
 test_expect_success 'test dcommit to scary branch' '
        (
                cd project &&
-               git reset --hard "refs/remotes/$scary_ref" &&
+               git reset --hard "refs/remotes/origin/$scary_ref" &&
                echo urls are scary >> foo &&
                git commit -m "eep" -- foo &&
                git svn dcommit
@@ -69,7 +74,7 @@ test_expect_success 'test dcommit to scary branch' '
 test_expect_success 'test dcommit to trailing_dotlock branch' '
        (
                cd project &&
-               git reset --hard "refs/remotes/trailing_dotlock%2Elock" &&
+               git reset --hard "refs/remotes/origin/trailing_dotlock%2Elock" &&
                echo who names branches like this anyway? >> foo &&
                git commit -m "bar" -- foo &&
                git svn dcommit