From: "Michael G. Schwern" <schwern@pobox.com>
To: git@vger.kernel.org, gitster@pobox.com
Cc: robbat2@gentoo.org, bwalton@artsci.utoronto.ca,
normalperson@yhbt.net, jrnieder@gmail.com, schwern@pobox.com
Subject: [PATCH 1/8] SVN 1.7 will truncate "not-a%40{0}" to just "not-a".
Date: Sat, 28 Jul 2012 02:47:45 -0700 [thread overview]
Message-ID: <1343468872-72133-2-git-send-email-schwern@pobox.com> (raw)
In-Reply-To: <1343468872-72133-1-git-send-email-schwern@pobox.com>
From: "Michael G. Schwern" <schwern@pobox.com>
Rather than guess what SVN is going to do for each version, make the test use
the branch name that was actually created.
---
t/t9118-git-svn-funky-branch-names.sh | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/t/t9118-git-svn-funky-branch-names.sh b/t/t9118-git-svn-funky-branch-names.sh
index 63fc982..193d3ca 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"
)
'
--
1.7.11.3
next prev parent reply other threads:[~2012-07-28 9:49 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-28 9:47 Fix git-svn for SVN 1.7 Michael G. Schwern
2012-07-28 9:47 ` Michael G. Schwern [this message]
2012-07-28 14:16 ` [PATCH 1/8] SVN 1.7 will truncate "not-a%40{0}" to just "not-a" Jonathan Nieder
2012-07-28 19:32 ` Michael G Schwern
2012-10-09 8:41 ` [PATCH/RFC] svn test: escape peg revision separator using empty peg rev Jonathan Nieder
2012-10-09 9:47 ` Michael J Gruber
2012-10-09 10:19 ` Jonathan Nieder
2012-10-10 20:37 ` Eric Wong
2012-10-10 21:02 ` Jonathan Nieder
2012-10-10 21:31 ` Eric Wong
2012-10-10 21:42 ` Jonathan Nieder
2012-10-10 22:16 ` Eric Wong
2012-10-10 22:33 ` Junio C Hamano
2012-07-28 9:47 ` [PATCH 2/8] Fix typo in test Michael G. Schwern
2012-07-28 9:47 ` [PATCH 3/8] Improve our URL canonicalization to be more like SVN 1.7's Michael G. Schwern
2012-07-28 9:47 ` [PATCH 4/8] Replace hand rolled URL escapes with canonicalization Michael G. Schwern
2012-07-28 9:47 ` [PATCH 5/8] Canonicalize earlier in a couple spots Michael G. Schwern
2012-07-28 9:47 ` [PATCH 6/8] Add function to append a path to a URL Michael G. Schwern
2012-07-28 9:47 ` [PATCH 7/8] Turn on canonicalization on newly minted URLs Michael G. Schwern
2012-10-06 19:24 ` [PATCH/RFC] test: work around SVN 1.7 mishandling of svn:special changes Jonathan Nieder
2012-10-09 10:12 ` [PATCH/RFC v2] git svn: " Jonathan Nieder
2012-10-10 20:11 ` Eric Wong
2012-10-10 20:47 ` [PATCH v3] " Jonathan Nieder
2012-07-28 9:47 ` [PATCH 8/8] Remove some ad hoc canonicalizations Michael G. Schwern
2012-07-30 20:38 ` Fix git-svn for SVN 1.7 Eric Wong
2012-07-30 21:10 ` Michael G Schwern
2012-07-30 22:15 ` Eric Wong
2012-07-31 1:04 ` Michael G Schwern
2012-07-31 2:18 ` Eric Wong
2012-07-31 4:30 ` Michael G Schwern
2012-07-31 6:53 ` Junio C Hamano
2012-07-31 9:54 ` Michael G Schwern
2012-07-31 20:01 ` Eric Wong
2012-07-31 23:05 ` Junio C Hamano
2012-07-31 23:28 ` Michael G Schwern
2012-07-31 23:24 ` Michael G Schwern
2012-08-01 21:30 ` Eric Wong
2012-08-02 10:31 ` Eric Wong
2012-08-02 16:07 ` Jonathan Nieder
2012-08-02 18:58 ` Junio C Hamano
2012-08-02 19:50 ` Robin H. Johnson
2012-08-02 22:10 ` Eric Wong
2012-08-21 4:04 ` Junio C Hamano
2012-08-21 21:03 ` Eric Wong
2012-08-21 21:34 ` Junio C Hamano
2012-08-02 20:51 ` Eric Wong
2012-08-02 21:22 ` Junio C Hamano
2012-08-02 21:42 ` Eric Wong
2012-08-02 21:55 ` Eric Wong
2012-08-02 22:05 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1343468872-72133-2-git-send-email-schwern@pobox.com \
--to=schwern@pobox.com \
--cc=bwalton@artsci.utoronto.ca \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=normalperson@yhbt.net \
--cc=robbat2@gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).