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
This commit is contained in:
15
git-svn.perl
15
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};
|
||||
|
Reference in New Issue
Block a user