kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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

* git://git.bogomips.org/git-svn:
  git svn: avoid unnecessary '/' in paths for SVN
  git-svn: strip off leading slashes on --trunk argument
maint
Junio C Hamano 2010-06-14 10:05:09 -07:00
parent 6339f67fed b1a954a37c
commit 0925c02e21
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
git-svn.perl
View File

@ -963,6 +963,7 @@ sub cmd_multi_init {
} }
do_git_init_db(); do_git_init_db();
if (defined $_trunk) { if (defined $_trunk) {
$_trunk =~ s#^/+##;
my $trunk_ref = 'refs/remotes/' . $_prefix . 'trunk'; my $trunk_ref = 'refs/remotes/' . $_prefix . 'trunk';
# try both old-style and new-style lookups: # try both old-style and new-style lookups:
my $gs_trunk = eval { Git::SVN->new($trunk_ref) }; my $gs_trunk = eval { Git::SVN->new($trunk_ref) };
@ -2054,6 +2055,9 @@ sub new {
"\":$ref_id\$\" in config\n"; "\":$ref_id\$\" in config\n";
($self->{path}, undef) = split(/\s*:\s*/, $fetch); ($self->{path}, undef) = split(/\s*:\s*/, $fetch);
} }
$self->{path} =~ s{/+}{/}g;
$self->{path} =~ s{\A/}{};
$self->{path} =~ s{/\z}{};
$self->{url} = command_oneline('config', '--get', $self->{url} = command_oneline('config', '--get',
"svn-remote.$repo_id.url") or "svn-remote.$repo_id.url") or
die "Failed to read \"svn-remote.$repo_id.url\" in config\n"; die "Failed to read \"svn-remote.$repo_id.url\" in config\n";