git svn: URL-decode left-hand side of svn refspec
authorSteven Walter <swalter@lpdev.prtdev.lexmark.com>
Tue, 3 Aug 2010 23:21:25 +0000 (19:21 -0400)
committerEric Wong <normalperson@yhbt.net>
Thu, 5 Aug 2010 06:33:23 +0000 (06:33 +0000)
This change allows git-svn to handle an URL with colons in the path

[ew: rewritten to use uri_decode() function]

Signed-off-by: Eric Wong <normalperson@yhbt.net>
git-svn.perl

index 8d2ef3d16f32d89a0d110a4539f9460436e0ce3b..34884b8fce37008ca05369dbd365573c7112ca21 100755 (executable)
@@ -1820,6 +1820,7 @@ sub read_all_remotes {
                        die("svn-remote.$remote: remote ref '$remote_ref' "
                            . "must start with 'refs/'\n")
                                unless $remote_ref =~ m{^refs/};
+                       $local_ref = uri_decode($local_ref);
                        $r->{$remote}->{fetch}->{$local_ref} = $remote_ref;
                        $r->{$remote}->{svm} = {} if $use_svm_props;
                } elsif (m!^(.+)\.usesvmprops=\s*(.*)\s*$!) {
@@ -1832,6 +1833,7 @@ sub read_all_remotes {
                        die("svn-remote.$remote: remote ref '$remote_ref' ($t) "
                            . "must start with 'refs/'\n")
                                unless $remote_ref =~ m{^refs/};
+                       $local_ref = uri_decode($local_ref);
                        my $rs = {
                            t => $t,
                            remote => $remote,