diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-07-07 16:31:55 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-07-07 16:31:55 -0700 |
commit | 07e2fbcb90bf0fc53bc67b970704730832c6d3d4 (patch) | |
tree | d9e96b51ddddf1db9aee0f62ea2f1ae0c7289081 | |
parent | 92371226ac5bee99dc926c982f97d9d2280bd954 (diff) | |
parent | 39f319f4d51966419c0725d1145677457d6f162a (diff) | |
download | git-07e2fbcb90bf0fc53bc67b970704730832c6d3d4.tar.gz |
Merge branch 'maint'
* maint:
git-svn.perl: workaround assertions in svn library 1.5.0
-rwxr-xr-x | git-svn.perl | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/git-svn.perl b/git-svn.perl index f789a6eeca..a366c891dc 100755 --- 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; } |