Merge branch 'maint'

* maint:
git-svn.perl: workaround assertions in svn library 1.5.0

diff --git a/git-svn.perl b/git-svn.perl
index f789a6eeca12ed34e6ef3746c3062e56f791d7e9..a366c891dc9892550093f0bb760d5d2580eb11cd 100755 (executable)
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -643,6 +643,8 @@ sub canonicalize_path {
        $path =~ s#/[^/]+/\.\.##g;
        $path =~ s#/$##g;
        $path =~ s#^\./## if $dot_slash_added;
+       $path =~ s#^/##;
+       $path =~ s#^\.$##;
        return $path;
 }