[PATCH] git-svn fails in prop_walk if $self->{path} is not empty

From: Gerrit Pape <pape@smarden.org>
Date: May 27, 2008, 08:46 UTC
Message-ID: <20080527084655.20379.qmail@5bba46d46c095e.315fe32.mid.smarden.org>

From: Christian Engwer <christi@uni-hd.de>

If url://repo/trunk is the current Git branch, prop_walk strips trunk from the path name. That is useful as, for example "git svn show-ignore" should not return results like

trunk/foo

but

foo

if svn:ignore for trunk includes foo.

The problem now is that prop_walk strips trunk from the path and then calls itself recursively. But now trunk is missing in the path and get_dir fails, because it is called for a non existing path.

The attached patch fixed the problem, by adding the priviously stipped $self->{path} in the recursive call. I tested it with my current git-svn repository for the commands show-ignore and show-external.

Patch was submitted through
 http://bugs.debian.org/477393

Signed-off-by: Gerrit Pape <pape@smarden.org>
---

I'm not that much a git-svn user, and didn't test this thoroughly. I'd be happy if anyone could crossread/test this, and maybe add a Acked-By.

Thanks, Gerrit.

 git-svn.perl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/git-svn.perl b/git-svn.perl
index 37976f2..72fef16 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -1918,7 +1918,7 @@ sub prop_walk {
 
 	foreach (sort keys %$dirent) {
 		next if $dirent->{$_}->{kind} != $SVN::Node::dir;
-		$self->prop_walk($p . $_, $rev, $sub);
+		$self->prop_walk($self->{path} . $p . $_, $rev, $sub);
 	}
 }

-- 
1.5.5.1