From: Pat Thoyts <patthoyts@users.sourceforge.net>
To: Git <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>,
msysGit <msysgit@googlegroups.com>,
Sebastian Schuberth <sschuberth@gmail.com>
Subject: [PATCH 4/8] git-svn: On MSYS, escape and quote SVN_SSH also if set by the user
Date: Fri, 14 Oct 2011 23:53:31 +0100 [thread overview]
Message-ID: <1318632815-29945-5-git-send-email-patthoyts@users.sourceforge.net> (raw)
In-Reply-To: <1318632815-29945-1-git-send-email-patthoyts@users.sourceforge.net>
From: Sebastian Schuberth <sschuberth@gmail.com>
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>
---
git-svn.perl | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/git-svn.perl b/git-svn.perl
index a0410f0..3b33379 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};
--
1.7.7.1.gbba15
next prev parent reply other threads:[~2011-10-14 22:55 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-14 22:53 [PATCH 0/8] Some patches from msysGit Pat Thoyts
2011-10-14 22:53 ` [PATCH 1/8] t1020: disable the pwd test on MinGW Pat Thoyts
2011-10-14 22:53 ` [PATCH 2/8] t1402: Ignore a few cases that must fail due to DOS path expansion Pat Thoyts
2011-10-15 5:36 ` Junio C Hamano
2011-10-15 13:49 ` Pat Thoyts
2011-10-15 20:15 ` Junio C Hamano
2011-10-14 22:53 ` [PATCH 3/8] t9001: do not fail only due to CR/LF issues Pat Thoyts
2011-10-14 22:53 ` Pat Thoyts [this message]
2011-10-14 22:53 ` [PATCH 5/8] t9901: fix line-ending dependency on windows Pat Thoyts
2011-10-15 5:44 ` Junio C Hamano
2011-10-15 12:25 ` Pat Thoyts
2011-10-14 22:53 ` [PATCH 6/8] t9300: do not run --cat-blob-fd related tests on MinGW Pat Thoyts
2011-10-14 22:53 ` [PATCH 7/8] mergetools: use the correct tool for Beyond Compare 3 on Windows Pat Thoyts
2011-10-15 5:50 ` Junio C Hamano
2011-10-15 10:27 ` Sebastian Schuberth
2011-10-15 12:39 ` Pat Thoyts
2011-10-16 10:12 ` Sebastian Schuberth
2011-10-16 10:21 ` Sebastian Schuberth
2011-10-15 20:14 ` Junio C Hamano
2011-10-16 10:11 ` Sebastian Schuberth
2011-10-14 22:53 ` [PATCH 8/8] mingw: ensure sockets are initialized before calling gethostname Pat Thoyts
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1318632815-29945-5-git-send-email-patthoyts@users.sourceforge.net \
--to=patthoyts@users.sourceforge.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=msysgit@googlegroups.com \
--cc=sschuberth@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).