Merge branch 'pb/cvsserver'

[git.git] / git-svn.perl

diff --git a/git-svn.perl b/git-svn.perl
index bba22c1321056f5daa58a6913ccc406850700b25..1b44cbe10682401b9296d19f7a3595819e60702b 100755 (executable)
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -1900,7 +1900,7 @@ sub prop_walk {
 
        foreach (sort keys %$dirent) {
                next if $dirent->{$_}->{kind} != $SVN::Node::dir;
-               $self->prop_walk($path . '/' . $_, $rev, $sub);
+               $self->prop_walk($p . $_, $rev, $sub);
        }
 }
 
@@ -3665,7 +3665,7 @@ sub escape_uri_only {
        my ($uri) = @_;
        my @tmp;
        foreach (split m{/}, $uri) {
-               s/([^\w.-])/sprintf("%%%02X",ord($1))/eg;
+               s/([^\w.%-]|%(?![a-fA-F0-9]{2}))/sprintf("%%%02X",ord($1))/eg;
                push @tmp, $_;
        }
        join('/', @tmp);