aboutsummaryrefslogtreecommitdiff
path: root/perl/Git/SVN.pm
diff options
context:
space:
mode:
authorMichael G. Schwern <schwern@pobox.com>2012-07-28 02:47:48 -0700
committerEric Wong <normalperson@yhbt.net>2012-08-02 21:46:01 +0000
commit9c27a57b2da502b7dd3736013b7a185fb6e5064e (patch)
treeb3579418b94acaa426a99c4493f5f64ae5166111 /perl/Git/SVN.pm
parent93c3fcbe4d4893fac6c9de64219b2eda0b309a13 (diff)
downloadgit-9c27a57b2da502b7dd3736013b7a185fb6e5064e.tar.gz
git-9c27a57b2da502b7dd3736013b7a185fb6e5064e.tar.xz
git-svn: replace URL escapes with canonicalization
The old hand-rolled URL escape functions were inferior to canonicalization functions. Continuing to move towards getting everything canonicalizing the same way. * Git::SVN->init_remote_config and Git::SVN::Ra->minimize_url both have to canonicalize the same way else init_remote_config will incorrectly think they're different URLs causing t9107-git-svn-migrate.sh to fail. [ew: commit title] Signed-off-by: Eric Wong <normalperson@yhbt.net>
Diffstat (limited to 'perl/Git/SVN.pm')
-rw-r--r--perl/Git/SVN.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm
index a2e7144b4..6a2a52e80 100644
--- a/perl/Git/SVN.pm
+++ b/perl/Git/SVN.pm
@@ -296,7 +296,7 @@ sub find_existing_remote {
sub init_remote_config {
my ($self, $url, $no_write) = @_;
- $url =~ s!/+$!!; # strip trailing slash
+ $url = canonicalize_url($url);
my $r = read_all_remotes();
my $existing = find_existing_remote($url, $r);
if ($existing) {