diff options
| author | Michael G. Schwern <schwern@pobox.com> | 2012-07-28 02:47:45 -0700 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2012-08-02 21:45:58 +0000 |
| commit | dad9090f89b8d24f2cb7ecc70f21f52274224c30 (patch) | |
| tree | ac3a06ecfed6eaa9f14bc95f751b51f1f206eb93 /t | |
| parent | 565e56c2cc7ebe42ad12ee5970f3d5af1dc3f36c (diff) | |
| download | git-dad9090f89b8d24f2cb7ecc70f21f52274224c30.tar.gz git-dad9090f89b8d24f2cb7ecc70f21f52274224c30.tar.xz | |
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>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t9118-git-svn-funky-branch-names.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/t/t9118-git-svn-funky-branch-names.sh b/t/t9118-git-svn-funky-branch-names.sh index 63fc982c8..193d3cabd 100755 --- a/t/t9118-git-svn-funky-branch-names.sh +++ b/t/t9118-git-svn-funky-branch-names.sh @@ -32,6 +32,11 @@ test_expect_success 'setup svnrepo' ' 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 && ( @@ -42,7 +47,7 @@ test_expect_success 'test clone with funky branch names' ' 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/$non_reflog" ) ' |