diff options
| author | Sebastian Schuberth <sschuberth@gmail.com> | 2011-10-14 23:53:31 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-14 22:38:15 -0700 |
| commit | 184892fb3e19cd28aaced4ca185257ed5b3acc78 (patch) | |
| tree | ba58be0f99a32b9e61657df5ca5cf1566c44c9ad | |
| parent | 72b5158b25ce67a6886dab58011f19ea529742d6 (diff) | |
| download | git-184892fb3e19cd28aaced4ca185257ed5b3acc78.tar.gz git-184892fb3e19cd28aaced4ca185257ed5b3acc78.tar.xz | |
git-svn: On MSYS, escape and quote SVN_SSH also if set by the user
While GIT_SSH does not require any escaping / quoting (e.g. for paths
containing spaces), SVN_SSH requires it due to its use in a Perl script.
Previously, SVN_SSH has only been escaped and quoted automatically if it
was unset and thus derived from GIT_SSH. For user convenience, do the
escaping and quoting also for a SVN_SSH set by the user. This way, the
user is able to use the same unescaped and unquoted syntax for GIT_SSH
and SVN_SSH.
Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -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 a0410f055..3b3337947 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}; |