diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-06-14 10:05:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-14 10:05:09 -0700 |
| commit | 0925c02e212fc69dfd095ca1116e3d8999a95e44 (patch) | |
| tree | 5777060af08439122ae896ee9e5046a9828dcd77 | |
| parent | Merge branch 'maint' (diff) | |
| parent | git svn: avoid unnecessary '/' in paths for SVN (diff) | |
| download | tgif-0925c02e212fc69dfd095ca1116e3d8999a95e44.tar.xz | |
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
| -rwxr-xr-x | git-svn.perl | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/git-svn.perl b/git-svn.perl index 09c4ca56f0..19d6848d0e 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -963,6 +963,7 @@ sub cmd_multi_init { } do_git_init_db(); if (defined $_trunk) { + $_trunk =~ s#^/+##; my $trunk_ref = 'refs/remotes/' . $_prefix . 'trunk'; # try both old-style and new-style lookups: my $gs_trunk = eval { Git::SVN->new($trunk_ref) }; @@ -2054,6 +2055,9 @@ sub new { "\":$ref_id\$\" in config\n"; ($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', "svn-remote.$repo_id.url") or die "Failed to read \"svn-remote.$repo_id.url\" in config\n"; |