[PATCH] git-svn: Support custom tunnel schemes instead of SSH only

[PATCH] git-svn: Support custom tunnel schemes instead of SSH only

[Sebastian Schuberth]

This originates from an msysgit pull request, see:

https://github.com/msysgit/git/pull/58

Signed-off-by: Eric Wieser <wieser.eric@gmail.com>
Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
---
 perl/Git/SVN/Ra.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/perl/Git/SVN/Ra.pm b/perl/Git/SVN/Ra.pm
index 049c97b..6a212eb 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;
-- 
1.8.1.msysgit.1

Re: [PATCH] git-svn: Support custom tunnel schemes instead of SSH only

[Eric Wong]

Sebastian Schuberth <sschuberth@gmail.com> wrote:
> This originates from an msysgit pull request, see:
> 
> https://github.com/msysgit/git/pull/58
> 
> Signed-off-by: Eric Wieser <wieser.eric@gmail.com>
> Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>

Thanks, looks obviously correct.

Signed-off-by: Eric Wong <normalperson@yhbt.net>

> diff --git a/perl/Git/SVN/Ra.pm b/perl/Git/SVN/Ra.pm
> index 049c97b..6a212eb 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;
> -- 

Junio:

The following changes since commit 2bba2f0e6542d541e9f27653d8c9d5fc8d0e679c:

  More topics from the second batch for 1.8.3 (2013-03-26 13:16:11 -0700)

are available in the git repository at:

  git://git.bogomips.org/git-svn.git master

for you to fetch changes up to 3747c015704399dea1aa7ae6569a507e5727e20b:

  git-svn: Support custom tunnel schemes instead of SSH only (2013-03-27 04:28:04 +0000)

----------------------------------------------------------------
Sebastian Schuberth (1):
      git-svn: Support custom tunnel schemes instead of SSH only

 perl/Git/SVN/Ra.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Re: [PATCH] git-svn: Support custom tunnel schemes instead of SSH only

[Junio C Hamano]

Eric Wong <normalperson@yhbt.net> writes:

> Sebastian Schuberth <sschuberth@gmail.com> wrote:
>> This originates from an msysgit pull request, see:
>> 
>> https://github.com/msysgit/git/pull/58
>> 
>> Signed-off-by: Eric Wieser <wieser.eric@gmail.com>
>> Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
>
> Thanks, looks obviously correct.
>
> Signed-off-by: Eric Wong <normalperson@yhbt.net>
> ...
>
> Junio:
>
> The following changes since commit 2bba2f0e6542d541e9f27653d8c9d5fc8d0e679c:
>
>   More topics from the second batch for 1.8.3 (2013-03-26 13:16:11 -0700)
>
> are available in the git repository at:
>
>   git://git.bogomips.org/git-svn.git master
>
> for you to fetch changes up to 3747c015704399dea1aa7ae6569a507e5727e20b:
>
>   git-svn: Support custom tunnel schemes instead of SSH only (2013-03-27 04:28:04 +0000)

Thanks.  Will pull.

By the way, did nobody in the patch chain find the log message
problematic?  It does not give any information other than a URL to
an external site, and if you look at the URL it refers to, it only
says

  "git svn fetch" failed while talking to svn+xyz:// at Git/SVN/Ra.pm line 307

which could easily have been written in the log message itself with
fewer words.

Re: [PATCH] git-svn: Support custom tunnel schemes instead of SSH only

[Eric Wong]

Junio C Hamano <gitster@pobox.com> wrote:
> Eric Wong <normalperson@yhbt.net> writes:
> >
> >   git-svn: Support custom tunnel schemes instead of SSH only (2013-03-27 04:28:04 +0000)
> 
> Thanks.  Will pull.
> 
> By the way, did nobody in the patch chain find the log message
> problematic?  It does not give any information other than a URL to
> an external site, and if you look at the URL it refers to, it only
> says
> 
>   "git svn fetch" failed while talking to svn+xyz:// at Git/SVN/Ra.pm line 307
> 
> which could easily have been written in the log message itself with
> fewer words.

Oops, I wasn't happy with the log message, either, but remained silent
since I thought the subject/title for an obvious one-line change was
sufficient.  In other words, I think an empty log message (+S-o-b) would
suffice, too.