mirror of
https://github.com/git/git.git
synced 2024-12-04 07:24:41 +08:00
44bc5ac71f
This test script uses "svn cp" to create a branch with an @-sign in
its name:
svn cp "pr ject/trunk" "pr ject/branches/not-a@{0}reflog"
That sets up for later tests that fetch the branch and check that git
svn mangles the refname appropriately.
Unfortunately, modern svn versions interpret path arguments with an
@-sign as an example of path@revision syntax (which pegs a path to a
particular revision) and truncate the path or error out with message
"svn: E205000: Syntax error parsing peg revision '{0}reflog'".
When using subversion 1.6.x, escaping the @ sign as %40 avoids trouble
(see 08fd28bb, 2010-07-08). Newer versions are stricter:
$ svn cp "$repo/pr ject/trunk" "$repo/pr ject/branches/not-a%40{reflog}"
svn: E205000: Syntax error parsing peg revision '%7B0%7Dreflog'
The recommended method for escaping a literal @ sign in a path passed
to subversion is to add an empty peg revision at the end of the path
("branches/not-a@{0}reflog@"). Do that.
Pre-1.6.12 versions of Subversion probably treat the trailing @ as
another literal @-sign (svn issue 3651). Luckily ever since
v1.8.0-rc0~155^2~7 (t9118: workaround inconsistency between SVN
versions, 2012-07-28) the test can survive that.
Tested with Debian Subversion 1.6.12dfsg-6 and 1.7.5-1 and r1395837
of Subversion trunk (1.8.x).
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Tested-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Eric Wong <normalperson@yhbt.net>
87 lines
2.6 KiB
Bash
Executable File
87 lines
2.6 KiB
Bash
Executable File
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2007 Eric Wong
|
|
#
|
|
|
|
test_description='git svn funky branch names'
|
|
. ./lib-git-svn.sh
|
|
|
|
# Abo-Uebernahme (Bug #994)
|
|
scary_uri='Abo-Uebernahme%20%28Bug%20%23994%29'
|
|
scary_ref='Abo-Uebernahme%20(Bug%20#994)'
|
|
|
|
test_expect_success 'setup svnrepo' '
|
|
mkdir project project/trunk project/branches project/tags &&
|
|
echo foo > project/trunk/foo &&
|
|
svn_cmd import -m "$test_description" project "$svnrepo/pr ject" &&
|
|
rm -rf project &&
|
|
svn_cmd cp -m "fun" "$svnrepo/pr ject/trunk" \
|
|
"$svnrepo/pr ject/branches/fun plugin" &&
|
|
svn_cmd cp -m "more fun!" "$svnrepo/pr ject/branches/fun plugin" \
|
|
"$svnrepo/pr ject/branches/more fun plugin!" &&
|
|
svn_cmd cp -m "scary" "$svnrepo/pr ject/branches/fun plugin" \
|
|
"$svnrepo/pr ject/branches/$scary_uri" &&
|
|
svn_cmd cp -m "leading dot" "$svnrepo/pr ject/trunk" \
|
|
"$svnrepo/pr ject/branches/.leading_dot" &&
|
|
svn_cmd cp -m "trailing dot" "$svnrepo/pr ject/trunk" \
|
|
"$svnrepo/pr ject/branches/trailing_dot." &&
|
|
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@{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/$non_reflog"
|
|
)
|
|
'
|
|
|
|
test_expect_success 'test dcommit to funky branch' "
|
|
(
|
|
cd project &&
|
|
git reset --hard 'refs/remotes/more%20fun%20plugin!' &&
|
|
echo hello >> foo &&
|
|
git commit -m 'hello' -- foo &&
|
|
git svn dcommit
|
|
)
|
|
"
|
|
|
|
test_expect_success 'test dcommit to scary branch' '
|
|
(
|
|
cd project &&
|
|
git reset --hard "refs/remotes/$scary_ref" &&
|
|
echo urls are scary >> foo &&
|
|
git commit -m "eep" -- foo &&
|
|
git svn dcommit
|
|
)
|
|
'
|
|
|
|
test_expect_success 'test dcommit to trailing_dotlock branch' '
|
|
(
|
|
cd project &&
|
|
git reset --hard "refs/remotes/trailing_dotlock%2Elock" &&
|
|
echo who names branches like this anyway? >> foo &&
|
|
git commit -m "bar" -- foo &&
|
|
git svn dcommit
|
|
)
|
|
'
|
|
|
|
stop_httpd
|
|
|
|
test_done
|