git-svn: remove redundant slashes from show-ignore
authorEric Wong <normalperson@yhbt.net>
Sat, 29 Mar 2008 23:37:17 +0000 (16:37 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 31 Mar 2008 05:03:05 +0000 (22:03 -0700)
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>
git-svn.perl
index 0c2b791eab3de64a8b642460b4b2b959936cca96..1b44cbe10682401b9296d19f7a3595819e60702b 100755 (executable)
@@ -1900,7 +1900,7 @@ sub prop_walk {
 
        foreach (sort keys %$dirent) {
                next if $dirent->{$_}->{kind} != $SVN::Node::dir;
 
        foreach (sort keys %$dirent) {
                next if $dirent->{$_}->{kind} != $SVN::Node::dir;
-               $self->prop_walk($path . '/' . $_, $rev, $sub);
+               $self->prop_walk($p . $_, $rev, $sub);
        }
 }
 
        }
 }