From: Junio C Hamano Date: Wed, 09 Jan 2008 20:54:22 GMT Subject: Re: [PATCH] Trim leading / off of paths in git-svn prop_walk Message-ID: <7v63y2hg8x.fsf@gitster.siamese.dyndns.org> In-Reply-To: <1199860640-74118-1-git-send-email-kevin@sb.org> Kevin Ballard writes: > prop_walk adds a leading / to all subdirectory paths. Unfortunately > this causes a problem when the remote repo lives in a subdirectory itself, > as the leading / causes subsequent PROPFIND calls to be executed on > the wrong path. Trimming the / before calling the PROPFIND fixes this problem. > > Signed-off-by: Kevin Ballard Eric, the change is very limited in scope (only the parameter to ra->get_dir() changes) so I can apply myself, if you agree this is a trivially correct fix. I just do not know svn-perl interface well enough to judge. > All tests passed after this change, but since it seems to only apply > to WebDAV SVN repos I saw no way to add a new test. > git-svn.perl | 1 + > 1 files changed, 1 insertions(+), 0 deletions(-) > > diff --git a/git-svn.perl b/git-svn.perl > index 3308fe1..d5316eb 100755 > --- a/git-svn.perl > +++ b/git-svn.perl > @@ -1858,6 +1858,7 @@ sub rel_path { > sub prop_walk { > my ($self, $path, $rev, $sub) = @_; > > + $path =~ s#^/##; > my ($dirent, undef, $props) = $self->ra->get_dir($path, $rev); > $path =~ s#^/*#/#g; > my $p = $path; > -- > 1.5.4.rc2.68.ge708a-dirty