diff options
| author | Eric Wong <normalperson@yhbt.net> | 2016-03-16 20:14:08 (GMT) |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2016-03-16 20:16:23 (GMT) |
| commit | b557165311f7ed1b94d94a74e7ea3a6e76bbbe88 (patch) | |
| tree | b3a9184cc81ad09786f4b9858bba4a5f734a2276 /git-svn.perl | |
| parent | 4be4d550635d25a5050c3539f8ad3be44dabfce9 (diff) | |
| download | git-b557165311f7ed1b94d94a74e7ea3a6e76bbbe88.zip git-b557165311f7ed1b94d94a74e7ea3a6e76bbbe88.tar.gz git-b557165311f7ed1b94d94a74e7ea3a6e76bbbe88.tar.bz2 | |
git-svn: fix URL canonicalization during init w/ SVN 1.7+
URL canonicalization when full URLs are passed became broken
when using SVN::_Core::svn_dirent_canonicalize under SVN 1.7.
Ensure we canonicalize paths and URLs with appropriate functions
for each type from now on as the path/URL-agnostic
SVN::_Core::svn_path_canonicalize function is deprecated in SVN.
Tested with the following commands:
git svn init -T svn://svn.code.sf.net/p/squirrelmail/code/trunk
git svn init -b svn://svn.code.sf.net/p/squirrelmail/code/branches
Reported-by: Adam Dinwoodie <adam@dinwoodie.org>
http://mid.gmane.org/20160315162344.GM29016@dinwoodie.org
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Diffstat (limited to 'git-svn.perl')
| -rwxr-xr-x | git-svn.perl | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/git-svn.perl b/git-svn.perl index fa5f253..05eced0 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -1745,11 +1745,12 @@ sub post_fetch_checkout { sub complete_svn_url { my ($url, $path) = @_; - $path = canonicalize_path($path); - # If the path is not a URL... - if ($path !~ m#^[a-z\+]+://#) { - if (!defined $url || $url !~ m#^[a-z\+]+://#) { + if ($path =~ m#^[a-z\+]+://#i) { # path is a URL + $path = canonicalize_url($path); + } else { + $path = canonicalize_path($path); + if (!defined $url || $url !~ m#^[a-z\+]+://#i) { fatal("E: '$path' is not a complete URL ", "and a separate URL is not specified"); } @@ -1764,11 +1765,12 @@ sub complete_url_ls_init { print STDERR "W: $switch not specified\n"; return; } - $repo_path = canonicalize_path($repo_path); - if ($repo_path =~ m#^[a-z\+]+://#) { + if ($repo_path =~ m#^[a-z\+]+://#i) { + $repo_path = canonicalize_url($repo_path); $ra = Git::SVN::Ra->new($repo_path); $repo_path = ''; } else { + $repo_path = canonicalize_path($repo_path); $repo_path =~ s#^/+##; unless ($ra) { fatal("E: '$repo_path' is not a complete URL ", |