[PATCH][resend 2] git-svn: Use GIT_SSH setting if SVN_SSH is not set

Karthik R· Aug 18, 2009, 20:31 UTC · lore

If SVN_SSH is defined, it will be used; else value in GIT_SSH is copied to SVN_SSH & then, only on Windows, the \s are escaped.

On Windows, the shell-variables must be set as follows
    GIT_SSH="C:\Program Files\PuTTY\plink.exe"
    SVN_SSH="C:\\Program Files\\PuTTY\\plink.exe"

See http://code.google.com/p/msysgit/issues/detail?id=305 --- Trying again following Dscho's comment (removed MSWin32) & using logic from Junio (don't muck with user's SVN_SSH; else use GIT_SSH to seed SVN_SSH & adjust the \s on Windows)

Previous life of patch: [PATCH] GIT_SSH does not override ssh in git-svn [PATCH][resend] git-svn: Respect GIT_SSH setting

 git-svn.perl |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

Show changes to git-svn.perl +9 −0

diff --git a/git-svn.perl b/git-svn.perl
index b0bfb74..ef86d10 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -21,6 +21,15 @@ $Git::SVN::default_ref_id = $ENV{GIT_SVN_ID} || 
'git-svn';
 $Git::SVN::Ra::_log_window_size = 100;
 $Git::SVN::_minimize_url = 'unset';
 
+if (! exists $ENV{SVN_SSH}) {
+    if (exists $ENV{GIT_SSH}) {
+        $ENV{SVN_SSH} = $ENV{GIT_SSH};
+        if ($^O eq 'msys') {
+            $ENV{SVN_SSH} =~ s/\\/\\\\/g;
+        }
+    }
+}
+
 $Git::SVN::Log::TZ = $ENV{TZ};
 $ENV{TZ} = 'UTC';
 $| = 1; # unbuffer STDOUT

-- 
1.5.4.3

patch[resend 2] git-svn: Use GIT_SSH setting if SVN_SSH is not set