@matheusbsbs / matheus-bagliano / commits / 884cce5bd0
Fork 0

git svn: avoid escaping '/' when renaming/copying files

Timothy Schaeffer reported the following: > Git-svn has been giving me the following error for some time > when calling "git svn dcommit": > > RA layer request failed: PROPFIND request failed on > '/svn/stf/branches/dev/sw%2Fdpemu%2Finclude%2FNetCnxn.h': PROPFIND of > '/svn/stf/branches/dev/sw%2Fdpemu%2Finclude%2FNetCnxn.h': 302 Found > (https://oursvnrepo.net) at /usr/local/libexec/git-core/git-svn line 508 > > This only occurred when git detected a rename or copy. > > Following the lead into git-svn.perl, > and noticing that some of the '/'s in the path were hex-encoded > and some were not, > I changed the regex used to find chars > to hex-encode in the relative part of the path > to exclude '/'. > It works, so far. > I have included a patch. While this has previous not been a problem in my experience, newer versions of SVN may be stricter and this does not introduce regressions in t9115. Signed-off-by: Eric Wong <normalperson@yhbt.net>

Eric Wong committed Jul 25, 2009 at 02:29 UTC 884cce5bd042e67a0d2a1a9317f8435634486ad1
1 file changed +1 -1
git-svn.perl
+1 -1
@@ -4005,7 +4005,7 @@ sub repo_path {
4005 sub url_path {
4006 my ($self, $path) = @_;
4007 if ($self->{url} =~ m#^https?://#) {
4008 - $path =~ s/([^~a-zA-Z0-9_.-])/uc sprintf("%%%02x",ord($1))/eg;
4008 + $path =~ s!([^~a-zA-Z0-9_./-])!uc sprintf("%%%02x",ord($1))!eg;
4009 }
4010 $self->{url} . '/' . $self->repo_path($path);
4011 }