X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-svn.perl;h=e0a48c2a8bd59b20f56d5a0570b19e0bd5c0d438;hb=0b59451c1be6be3d0df80be9dc8aeedb355ca44b;hp=e8457893db963ad3bb6be270aba0a81481119b1c;hpb=dee41f3e5569f9465018535f02d45796d84aebd8;p=git.git diff --git a/git-svn.perl b/git-svn.perl index e8457893d..e0a48c2a8 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -1327,8 +1327,10 @@ sub rel_path { my ($self) = @_; my $repos_root = $self->ra->{repos_root}; return $self->{path} if ($self->{url} eq $repos_root); - die "BUG: rel_path failed! repos_root: $repos_root, Ra URL: ", - $self->ra->{url}, " path: $self->{path}, URL: $self->{url}\n"; + my $url = $self->{url} . + (length $self->{path} ? "/$self->{path}" : $self->{path}); + $url =~ s!^\Q$repos_root\E(?:/+|$)!!g; + $url; } sub traverse_ignore {