X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-svn.perl;h=aceeca5a9487e47e281468d02ca10567b74217bf;hb=431d6e7bc85f693fe49a04142a8ab4d2d72b0257;hp=1a26843f44d687c5b89c118c31d5c088b41a1cb2;hpb=0d1f2a56b1f83a6d298e5c03bfe76a47caa753c2;p=git.git diff --git a/git-svn.perl b/git-svn.perl index 1a26843f4..aceeca5a9 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -2998,7 +2998,7 @@ sub find_extra_svk_parents { for my $ticket ( @tickets ) { my ($uuid, $path, $rev) = split /:/, $ticket; if ( $uuid eq $self->ra_uuid ) { - my $url = $self->rewrite_root || $self->{url}; + my $url = $self->{url}; my $repos_root = $url; my $branch_from = $path; $branch_from =~ s{^/}{}; @@ -3206,7 +3206,7 @@ sub find_extra_svn_parents { # are now marked as merge, we can add the tip as a parent. my @merges = split "\n", $mergeinfo; my @merge_tips; - my $url = $self->rewrite_root || $self->{url}; + my $url = $self->{url}; my $uuid = $self->ra_uuid; my %ranges; for my $merge ( @merges ) {