diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-10-18 21:59:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-18 21:59:11 -0700 |
| commit | 578183bcb0fd30b7a36b98b714de96220793e712 (patch) | |
| tree | fe34ca7c397d1ad49000624b7e5c59ccfa46a6ad /git-svn.perl | |
| parent | 54633cd53bf22672aed900a2a9df5d4f92548091 (diff) | |
| parent | f64943d242d3b0fff40684d09033f17bb9747a38 (diff) | |
| download | git-578183bcb0fd30b7a36b98b714de96220793e712.tar.gz | |
Merge branch 'pt/mingw-misc-fixes'
* pt/mingw-misc-fixes:
t9901: fix line-ending dependency on windows
mingw: ensure sockets are initialized before calling gethostname
mergetools: use the correct tool for Beyond Compare 3 on Windows
t9300: do not run --cat-blob-fd related tests on MinGW
git-svn: On MSYS, escape and quote SVN_SSH also if set by the user
t9001: do not fail only due to CR/LF issues
t1020: disable the pwd test on MinGW
Diffstat (limited to 'git-svn.perl')
| -rwxr-xr-x | git-svn.perl | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/git-svn.perl b/git-svn.perl index b608bbf95a..b67fef0bf6 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -22,14 +22,13 @@ $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; - $ENV{SVN_SSH} =~ s/(.*)/"$1"/; - } - } +if (! exists $ENV{SVN_SSH} && exists $ENV{GIT_SSH}) { + $ENV{SVN_SSH} = $ENV{GIT_SSH}; +} + +if (exists $ENV{SVN_SSH} && $^O eq 'msys') { + $ENV{SVN_SSH} =~ s/\\/\\\\/g; + $ENV{SVN_SSH} =~ s/(.*)/"$1"/; } $Git::SVN::Log::TZ = $ENV{TZ}; |