{"thread":{"id":"13745","subject":"[Nikolaus Schulz] Re: [PATCH] git-svn fails in prop_walk if $self->{path} is not empty","startedAt":"2008-05-31T21:24:27Z","lastAt":"2008-06-01T09:41:47Z","messageCount":2,"participants":["Junio C Hamano","Eric Wong"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"78246","messageId":"7v3anyf9pw.fsf@gitster.siamese.dyndns.org","threadId":"13745","inReplyTo":null,"subject":"[Nikolaus Schulz] Re: [PATCH] git-svn fails in prop_walk if $self->{path} is not empty","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-05-31T21:24:27Z","receivedAt":"2008-05-31T21:24:27Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Ping?\n\nDate:\tWed, 28 May 2008 00:54:02 +0200\nTo:\tgit@vger.kernel.org\nSubject: Re: [PATCH] git-svn fails in prop_walk if $self->{path} is not empty\nMessage-ID: <20080527225402.GA25550@penelope.zusammrottung.local>\nFrom:\tNikolaus Schulz <microschulz@web.de>\n\nHappy coincidence!\n\nThis patch happens to fix my problem posted in \"git-svn\n{show,create}-ignore chokes upon subdirs\" today. \n\nNikolaus\n\nOn Tue, May 27, 2008 at 08:46:55AM +0000, Gerrit Pape wrote:\n> From: Christian Engwer <christi@uni-hd.de>\n> \n> The problem now is that prop_walk strips trunk from the path and then\n> calls itself recursively. But now trunk is missing in the path and\n> get_dir fails, because it is called for a non existing path.\n> \n> The attached patch fixed the problem, by adding the priviously stipped\n> $self->{path} in the recursive call. \n> git-svn repository for the commands show-ignore and show-external.\n> \n> Patch was submitted through\n>  http://bugs.debian.org/477393\n> \n> Signed-off-by: Gerrit Pape <pape@smarden.org>\n> ---\n> \n> I'm not that much a git-svn user, and didn't test this thoroughly.  I'd\n> be happy if anyone could crossread/test this, and maybe add a Acked-By.\n> \n> Thanks, Gerrit.\n> \n> \n>  git-svn.perl |    2 +-\n>  1 files changed, 1 insertions(+), 1 deletions(-)\n> \n> diff --git a/git-svn.perl b/git-svn.perl\n> index 37976f2..72fef16 100755\n> --- a/git-svn.perl\n> +++ b/git-svn.perl\n> @@ -1918,7 +1918,7 @@ sub prop_walk {\n>  \n>  \tforeach (sort keys %$dirent) {\n>  \t\tnext if $dirent->{$_}->{kind} != $SVN::Node::dir;\n> -\t\t$self->prop_walk($p . $_, $rev, $sub);\n> +\t\t$self->prop_walk($self->{path} . $p . $_, $rev, $sub);\n>  \t}\n>  }\n"},{"id":"78282","messageId":"20080601094147.GA16064@hand.yhbt.net","threadId":"13745","inReplyTo":"7v3anyf9pw.fsf@gitster.siamese.dyndns.org","subject":"Re: [Nikolaus Schulz] Re: [PATCH] git-svn fails in prop_walk if $self->{path} is not empty","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2008-06-01T09:41:47Z","receivedAt":"2008-06-01T09:41:47Z","isPatch":true,"sender":{"key":"e@80x24.org","avatar":null},"body":"Junio C Hamano <gitster@pobox.com> wrote:\n> Ping?\n\nOops, missed this.  This looks right to me, (but haven't had time to\ntest to make sure this really works).\n\nThere is are minor spelling errors/typo in the commit message, which\nI've noted below, though.\n\nUnless Benoit steps in and objects:\n  Acked-By: Eric Wong <normalperson@yhbt.net>\n\n> Date:\tWed, 28 May 2008 00:54:02 +0200\n> To:\tgit@vger.kernel.org\n> Subject: Re: [PATCH] git-svn fails in prop_walk if $self->{path} is not empty\n> Message-ID: <20080527225402.GA25550@penelope.zusammrottung.local>\n> From:\tNikolaus Schulz <microschulz@web.de>\n> \n> Happy coincidence!\n> \n> This patch happens to fix my problem posted in \"git-svn\n> {show,create}-ignore chokes upon subdirs\" today. \n> \n> Nikolaus\n> \n> On Tue, May 27, 2008 at 08:46:55AM +0000, Gerrit Pape wrote:\n> > From: Christian Engwer <christi@uni-hd.de>\n> > \n> > The problem now is that prop_walk strips trunk from the path and then\n> > calls itself recursively. But now trunk is missing in the path and\n> > get_dir fails, because it is called for a non existing path.\n> > \n> > The attached patch fixed the problem, by adding the priviously stipped\n                                                      previously stripped\n> > $self->{path} in the recursive call. \n> > git-svn repository for the commands show-ignore and show-external.\n> > \n> > Patch was submitted through\n> >  http://bugs.debian.org/477393\n> > \n> > Signed-off-by: Gerrit Pape <pape@smarden.org>\n> > ---\n> > \n> > I'm not that much a git-svn user, and didn't test this thoroughly.  I'd\n> > be happy if anyone could crossread/test this, and maybe add a Acked-By.\n> > \n> > Thanks, Gerrit.\n> > \n> > \n> >  git-svn.perl |    2 +-\n> >  1 files changed, 1 insertions(+), 1 deletions(-)\n> > \n> > diff --git a/git-svn.perl b/git-svn.perl\n> > index 37976f2..72fef16 100755\n> > --- a/git-svn.perl\n> > +++ b/git-svn.perl\n> > @@ -1918,7 +1918,7 @@ sub prop_walk {\n> >  \n> >  \tforeach (sort keys %$dirent) {\n> >  \t\tnext if $dirent->{$_}->{kind} != $SVN::Node::dir;\n> > -\t\t$self->prop_walk($p . $_, $rev, $sub);\n> > +\t\t$self->prop_walk($self->{path} . $p . $_, $rev, $sub);\n> >  \t}\n> >  }\n"}]}