Merge git://git.bogomips.org/git-svn

gitster · gitster · commit a8033dfa6e61 · 2013-01-20T17:08:46.000-08:00
* git://git.bogomips.org/git-svn:
  git-svn: do not escape certain characters in paths
diff --git a/perl/Git/SVN/Editor.pm b/perl/Git/SVN/Editor.pm
@@ -145,7 +145,8 @@ sub repo_path {
 sub url_path {
 	my ($self, $path) = @_;
 	if ($self->{url} =~ m#^https?://#) {
-		$path =~ s!([^~a-zA-Z0-9_./-])!uc sprintf("%%%02x",ord($1))!eg;
+		# characters are taken from subversion/libsvn_subr/path.c
+		$path =~ s#([^~a-zA-Z0-9_./!$&'()*+,-])#uc sprintf("%%%02x",ord($1))#eg;
 	}
 	$self->{url} . '/' . $self->repo_path($path);
 }

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,8 @@ sub repo_path {`
`145`	`145`	`sub url_path {`
`146`	`146`	`my ($self, $path) = @_;`
`147`	`147`	`if ($self->{url} =~ m#^https?://#) {`
`148`		`- $path =~ s!([^~a-zA-Z0-9_./-])!uc sprintf("%%%02x",ord($1))!eg;`
	`148`	`+ # characters are taken from subversion/libsvn_subr/path.c`
	`149`	`+ $path =~ s#([^~a-zA-Z0-9_./!$&'()*+,-])#uc sprintf("%%%02x",ord($1))#eg;`
`149`	`150`	`}`
`150`	`151`	`$self->{url} . '/' . $self->repo_path($path);`
`151`	`152`	`}`