From: Christian Engwer Date: Tue, 27 May 2008 08:46:55 +0000 (+0000) Subject: git-svn fails in prop_walk if $self->{path} is not empty X-Git-Tag: v1.5.6-rc1~20 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b7166cce8cf4053d9f21e69505bef8699da68903;p=git.git git-svn fails in prop_walk if $self->{path} is not empty 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 previously 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 Signed-off-by: Junio C Hamano --- diff --git a/git-svn.perl b/git-svn.perl index dcb8b779c..47b0c37d1 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -1923,7 +1923,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); } }