Browse Source

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

* git://git.bogomips.org/git-svn:
  git svn: URL-decode left-hand side of svn refspec
maint
Junio C Hamano 15 years ago
parent
commit
730901ab00
  1. 2
      git-svn.perl

2
git-svn.perl

@ -1820,6 +1820,7 @@ sub read_all_remotes {
die("svn-remote.$remote: remote ref '$remote_ref' " die("svn-remote.$remote: remote ref '$remote_ref' "
. "must start with 'refs/'\n") . "must start with 'refs/'\n")
unless $remote_ref =~ m{^refs/}; unless $remote_ref =~ m{^refs/};
$local_ref = uri_decode($local_ref);
$r->{$remote}->{fetch}->{$local_ref} = $remote_ref; $r->{$remote}->{fetch}->{$local_ref} = $remote_ref;
$r->{$remote}->{svm} = {} if $use_svm_props; $r->{$remote}->{svm} = {} if $use_svm_props;
} elsif (m!^(.+)\.usesvmprops=\s*(.*)\s*$!) { } elsif (m!^(.+)\.usesvmprops=\s*(.*)\s*$!) {
@ -1832,6 +1833,7 @@ sub read_all_remotes {
die("svn-remote.$remote: remote ref '$remote_ref' ($t) " die("svn-remote.$remote: remote ref '$remote_ref' ($t) "
. "must start with 'refs/'\n") . "must start with 'refs/'\n")
unless $remote_ref =~ m{^refs/}; unless $remote_ref =~ m{^refs/};
$local_ref = uri_decode($local_ref);
my $rs = { my $rs = {
t => $t, t => $t,
remote => $remote, remote => $remote,

Loading…
Cancel
Save