diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-08-06 09:06:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-06 09:06:20 -0700 |
| commit | 730901ab00a87a57b99d6ceca78a2acdb10636e8 (patch) | |
| tree | 6baba555de52795d31ac759286eb8a155d6198fa | |
| parent | Merge branch 'maint' (diff) | |
| parent | git svn: URL-decode left-hand side of svn refspec (diff) | |
| download | tgif-730901ab00a87a57b99d6ceca78a2acdb10636e8.tar.xz | |
Merge git://git.bogomips.org/git-svn
* git://git.bogomips.org/git-svn:
git svn: URL-decode left-hand side of svn refspec
| -rwxr-xr-x | git-svn.perl | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/git-svn.perl b/git-svn.perl index 8d2ef3d16f..34884b8fce 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -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, |