From: Eric Wong <normalperson@yhbt.net>
Date: Sat, 29 Mar 2008 23:37:17 +0000 (-0700)
Subject: git-svn: remove redundant slashes from show-ignore
X-Git-Tag: v1.5.5-rc3~16
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=67dac28b904cf16e66c904eb61268b694809e4d5;p=git.git

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>
---

diff --git a/git-svn.perl b/git-svn.perl
index 0c2b791ea..1b44cbe10 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);
 	}
 }