t9118: workaround inconsistency between SVN versions
SVN 1.7 will truncate "not-a%40{0}" to just "not-a". Rather than guess what SVN is going to do for each version, make the test use the branch name that was actually created. [ew: commit title] Signed-off-by: Eric Wong <normalperson@yhbt.net>
Michael G. Schwern committed
Jul 28, 2012 at 02:47 UTC
dad9090f89b8d24f2cb7ecc70f21f52274224c30
1 file changed
+6
-1
t/t9118-git-svn-funky-branch-names.sh
+6
-1
@@ -32,6 +32,11 @@ test_expect_success 'setup svnrepo' '
32
start_httpd
33
'
34
35
+# SVN 1.7 will truncate "not-a%40{0]" to just "not-a".
36
+# Look at what SVN wound up naming the branch and use that.
37
+# Be sure to escape the @ if it shows up.
38
+non_reflog=`svn_cmd ls "$svnrepo/pr ject/branches" | grep not-a | sed 's/\///' | sed 's/@/%40/'`
39
+
40
test_expect_success 'test clone with funky branch names' '
41
git svn clone -s "$svnrepo/pr ject" project &&
42
(
@@ -42,7 +47,7 @@ test_expect_success 'test clone with funky branch names' '
47
git rev-parse "refs/remotes/%2Eleading_dot" &&
48
git rev-parse "refs/remotes/trailing_dot%2E" &&
49
git rev-parse "refs/remotes/trailing_dotlock%2Elock" &&
45
- git rev-parse "refs/remotes/not-a%40{0}reflog"
50
+ git rev-parse "refs/remotes/$non_reflog"
51
)
52
'
53