summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2008-03-30 00:37:17 +0100
committerJunio C Hamano <gitster@pobox.com>2008-03-31 07:03:05 +0200
commit67dac28b904cf16e66c904eb61268b694809e4d5 (patch)
treeb9460968c6a36f460da31492fb240ea5d873a62e
parentgit-p4: Handle Windows EOLs properly after removal of p4 submit template hand... (diff)
downloadgit-67dac28b904cf16e66c904eb61268b694809e4d5.tar.xz
git-67dac28b904cf16e66c904eb61268b694809e4d5.zip
git-svn: remove redundant slashes from show-ignore
Jonathan Scott Duff wrote: > Recently I tried "git svn showignore" on my parrot repository and it > failed. I tracked it down to the prop_walk() sub. When it recurses, > $path has an extra / on the beginning (i.e., when it recurses, it > tries to get the props for "//apps" instead of "/apps"). I *think* > this is because $path is used in the recursive call rather than $p > (which seems to contain a properly transformed $path). Anyway, I've > attached a patch that works for me and I think is generally the right > thing. Patch-submitted-by: Jonathan Scott Duff Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xgit-svn.perl2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-svn.perl b/git-svn.perl
index 0c2b791eab..1b44cbe106 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -1900,7 +1900,7 @@ sub prop_walk {
foreach (sort keys %$dirent) {
next if $dirent->{$_}->{kind} != $SVN::Node::dir;
- $self->prop_walk($path . '/' . $_, $rev, $sub);
+ $self->prop_walk($p . $_, $rev, $sub);
}
}