From: Junio C Hamano Date: Fri, 6 Aug 2010 16:06:20 +0000 (-0700) Subject: Merge git://git.bogomips.org/git-svn X-Git-Tag: v1.7.3-rc0~94 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/730901ab00a87a57b99d6ceca78a2acdb10636e8?hp=721e76cbfac650ce676fc789b717eb21e1daa46e Merge git://git.bogomips.org/git-svn * git://git.bogomips.org/git-svn: git svn: URL-decode left-hand side of svn refspec --- 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,