git-svn: fix show-ignore when not connected to the repository root
It was traversing the entire repository before. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
Eric Wong committed
Mar 4, 2007 at 00:15 UTC
102a0a2db14cd7604a8a2b6590ecbd6bf3136394
1 file changed
+2
-2
git-svn.perl
+2
-2
@@ -447,7 +447,7 @@ sub cmd_show_ignore {
447
my $url = (::working_head_info('HEAD'))[0];
448
my $gs = Git::SVN->find_by_url($url) || Git::SVN->new;
449
my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
450
- $gs->traverse_ignore(\*STDOUT, '', $r);
450
+ $gs->traverse_ignore(\*STDOUT, $gs->{path}, $r);
451
}
452
453
sub cmd_multi_init {
@@ -1334,7 +1334,7 @@ sub traverse_ignore {
1334
my $ra = $self->ra;
1335
my ($dirent, undef, $props) = $ra->get_dir($path, $r);
1336
my $p = $path;
1337
- $p =~ s#^\Q$ra->{svn_path}\E/##;
1337
+ $p =~ s#^\Q$self->{path}\E(/|$)##;
1338
print $fh length $p ? "\n# $p\n" : "\n# /\n";
1339
if (my $s = $props->{'svn:ignore'}) {
1340
$s =~ s/[\r\n]+/\n/g;