summaryrefslogtreecommitdiff
path: root/git-svnimport.perl
diff options
context:
space:
mode:
authorSasha Khapyorsky <sashak@voltaire.com>2007-01-07 02:22:10 +0200
committerJunio C Hamano <junkio@cox.net>2007-01-06 22:48:09 -0800
commit09c3a408da1d02a3ea1119694b5deaeb14c20d65 (patch)
tree22473a4f2a19b5a81572914373c59cd431157df6 /git-svnimport.perl
parent40006ea039b8d72cf6dce5816a50c8ba266833ee (diff)
downloadgit-09c3a408da1d02a3ea1119694b5deaeb14c20d65.tar.gz
git-svnimport: clean svn path when accessing SVN repo
Clean svn path from leading '/' when accessing SVN repo. Signed-off-by: Sasha Khapyorsky <sashak@voltaire.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-svnimport.perl')
-rwxr-xr-xgit-svnimport.perl4
1 files changed, 4 insertions, 0 deletions
diff --git a/git-svnimport.perl b/git-svnimport.perl
index f31fcf84ed..afbbe63c62 100755
--- a/git-svnimport.perl
+++ b/git-svnimport.perl
@@ -148,6 +148,7 @@ sub file {
print "... $rev $path ...\n" if $opt_v;
my (undef, $properties);
my $pool = SVN::Pool->new();
+ $path =~ s#^/*##;
eval { (undef, $properties)
= $self->{'svn'}->get_file($path,$rev,$fh,$pool); };
$pool->clear;
@@ -183,6 +184,7 @@ sub ignore {
my($self,$path,$rev) = @_;
print "... $rev $path ...\n" if $opt_v;
+ $path =~ s#^/*##;
my (undef,undef,$properties)
= $self->{'svn'}->get_dir($path,$rev,undef);
if (exists $properties->{'svn:ignore'}) {
@@ -199,6 +201,7 @@ sub ignore {
sub dir_list {
my($self,$path,$rev) = @_;
+ $path =~ s#^/*##;
my ($dirents,undef,$properties)
= $self->{'svn'}->get_dir($path,$rev,undef);
return $dirents;
@@ -356,6 +359,7 @@ open BRANCHES,">>", "$git_dir/svn2git";
sub node_kind($$) {
my ($svnpath, $revision) = @_;
my $pool=SVN::Pool->new;
+ $svnpath =~ s#^/*##;
my $kind = $svn->{'svn'}->check_path($svnpath,$revision,$pool);
$pool->clear;
return $kind;