threads / patch / 13683

patchgit-svn fails in prop_walk if $self->{path} is not empty

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

## tl;dr

2 messages between May 27, 2008 and May 27, 2008. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

Gerrit Pape· May 27, 2008, 08:46 UTC · lore

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

Show changes to git-svn.perl +1 −1

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

Nikolaus Schulz· May 27, 2008, 22:54 UTC · re: Gerrit Pape · lore

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

Happy coincidence!

This patch happens to fix my problem posted in "git-svn {show,create}-ignore chokes upon subdirs" today.

Nikolaus

On Tue, May 27, 2008 at 08:46:55AM +0000, Gerrit Pape wrote:

Show 37 quoted lines

> From: Christian Engwer <christi@uni-hd.de>
> 
> 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. 
> 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);
>  	}
>  }