git svn: fix reparenting when ugly http(s) URLs are used

Mishandling of http(s) in need of escaping was causing t9118-git-svn-funky-branch-names to fail when SVN_HTTPD_PORT was defined. This bug was exposed in (but not caused by) commit 0b2af45 (Fix branch detection when repository root is inaccessible) Signed-off-by: Eric Wong <[email protected]>
tadd · Jul 20, 2009 · 2a679c7 · 2a679c7
1 parent f0e8b1a
commit 2a679c7
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/git-svn.perl b/git-svn.perl
@@ -4525,10 +4525,12 @@ sub gs_do_switch {
 
 	my $full_url = $self->{url};
 	my $old_url = $full_url;
-	$full_url .= '/' . escape_uri_only($path) if length $path;
+	$full_url .= '/' . $path if length $path;
 	my ($ra, $reparented);
 
-	if ($old_url =~ m#^svn(\+ssh)?://#) {
+	if ($old_url =~ m#^svn(\+ssh)?://# ||
+	    ($full_url =~ m#^https?://# &&
+	     escape_url($full_url) ne $full_url)) {
 		$_[0] = undef;
 		$self = undef;
 		$RA = undef;