summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-03-27 09:29:05 -0700
committerJunio C Hamano <gitster@pobox.com>2013-03-27 09:29:05 -0700
commitccf23370aacf01111eebdee196da10d4e61a6be4 (patch)
tree32658c3c640f16f4878b4ef694a9571cd6ee3d9e
parente96a3b364968be19181474621169fc6906b3d9fc (diff)
parent3747c015704399dea1aa7ae6569a507e5727e20b (diff)
downloadgit-ccf23370aacf01111eebdee196da10d4e61a6be4.tar.gz
Merge branch 'master' of git://git.bogomips.org/git-svn
* 'master' of git://git.bogomips.org/git-svn: git-svn: Support custom tunnel schemes instead of SSH only
-rw-r--r--perl/Git/SVN/Ra.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl/Git/SVN/Ra.pm b/perl/Git/SVN/Ra.pm
index 049c97bfaf..6a212eb7a8 100644
--- a/perl/Git/SVN/Ra.pm
+++ b/perl/Git/SVN/Ra.pm
@@ -295,7 +295,7 @@ sub gs_do_switch {
my $full_url = add_path_to_url( $self->url, $path );
my ($ra, $reparented);
- if ($old_url =~ m#^svn(\+ssh)?://# ||
+ if ($old_url =~ m#^svn(\+\w+)?://# ||
($full_url =~ m#^https?://# &&
canonicalize_url($full_url) ne $full_url)) {
$_[0] = undef;