]> rtime.felk.cvut.cz Git - git.git/commitdiff
git svn: avoid unnecessary '/' in paths for SVN
authorEric Wong <normalperson@yhbt.net>
Mon, 14 Jun 2010 04:31:10 +0000 (04:31 +0000)
committerEric Wong <normalperson@yhbt.net>
Mon, 14 Jun 2010 04:49:22 +0000 (04:49 +0000)
svn:// servers are more picky regarding redundant slashes
than file:// and http(s)://-backed respositories.  Since
the last commit, we avoid putting unnecessary slashes in
$GIT_CONFIG, but this doesn't help users who are already
set up that way.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
git-svn.perl

index 80ab45065e987d16f592476bfb824485a88958a2..19d6848d0e7754b9afb9fdbbac6fce31286468a5 100755 (executable)
@@ -2055,6 +2055,9 @@ sub new {
                         "\":$ref_id\$\" in config\n";
                ($self->{path}, undef) = split(/\s*:\s*/, $fetch);
        }
+       $self->{path} =~ s{/+}{/}g;
+       $self->{path} =~ s{\A/}{};
+       $self->{path} =~ s{/\z}{};
        $self->{url} = command_oneline('config', '--get',
                                       "svn-remote.$repo_id.url") or
                   die "Failed to read \"svn-remote.$repo_id.url\" in config\n";