diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-01-18 20:40:28 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-18 20:40:28 (GMT) |
| commit | 02f55e660ccbd2fa1e3b2c686200f0037568f854 (patch) | |
| tree | 539fedc6422e51fdd2282586bf2aecf8acd23c00 /perl/Git/SVN | |
| parent | bbc6f64b4eca0b792060ae8b8ccb58526dbbc076 (diff) | |
| parent | 2934a484fdaf9ceea4da2e9402a2f54dcaf59fb1 (diff) | |
| download | git-02f55e660ccbd2fa1e3b2c686200f0037568f854.zip git-02f55e660ccbd2fa1e3b2c686200f0037568f854.tar.gz git-02f55e660ccbd2fa1e3b2c686200f0037568f854.tar.bz2 | |
Merge git://bogomips.org/git-svn
* git://bogomips.org/git-svn:
git-svn: teach find-rev to find near matches
git svn: do not overescape URLs (fallback case)
Git::SVN::Editor::T: pass $deletions to ->A and ->D
Diffstat (limited to 'perl/Git/SVN')
| -rw-r--r-- | perl/Git/SVN/Editor.pm | 4 | ||||
| -rw-r--r-- | perl/Git/SVN/Utils.pm | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/perl/Git/SVN/Editor.pm b/perl/Git/SVN/Editor.pm index 3bbc20a..178920c 100644 --- a/perl/Git/SVN/Editor.pm +++ b/perl/Git/SVN/Editor.pm @@ -358,12 +358,12 @@ sub T { mode_a => $m->{mode_a}, mode_b => '000000', sha1_a => $m->{sha1_a}, sha1_b => '0' x 40, chg => 'D', file_b => $m->{file_b} - }); + }, $deletions); $self->A({ mode_a => '000000', mode_b => $m->{mode_b}, sha1_a => '0' x 40, sha1_b => $m->{sha1_b}, chg => 'A', file_b => $m->{file_b} - }); + }, $deletions); return; } diff --git a/perl/Git/SVN/Utils.pm b/perl/Git/SVN/Utils.pm index 8b8cf37..3d1a093 100644 --- a/perl/Git/SVN/Utils.pm +++ b/perl/Git/SVN/Utils.pm @@ -155,7 +155,7 @@ sub _canonicalize_url_path { my @parts; foreach my $part (split m{/+}, $uri_path) { - $part =~ s/([^~\w.%+-]|%(?![a-fA-F0-9]{2}))/sprintf("%%%02X",ord($1))/eg; + $part =~ s/([^!\$%&'()*+,.\/\w:=\@_`~-]|%(?![a-fA-F0-9]{2}))/sprintf("%%%02X",ord($1))/eg; push @parts, $part; } |