mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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 0b2af457a4
(Fix branch detection when repository root is inaccessible)

Signed-off-by: Eric Wong <normalperson@yhbt.net>
This commit is contained in:
Eric Wong
2009-07-19 22:08:45 -07:00
parent f0e8b1a3ed
commit 2a679c7a31
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
git-svn.perl
View File

@ -4525,10 +4525,12 @@ sub gs_do_switch {
my $full_url = $self->{url}; my $full_url = $self->{url};
my $old_url = $full_url; my $old_url = $full_url;
$full_url .= '/' . escape_uri_only($path) if length $path; $full_url .= '/' . $path if length $path;
my ($ra, $reparented); 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; $_[0] = undef;
$self = undef; $self = undef;
$RA = undef; $RA = undef;