summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShawn O. Pearce <sop@google.com>2009-04-23 17:22:18 -0700
committerShawn O. Pearce <sop@google.com>2009-04-23 17:22:18 -0700
commit2b5b4ac29275ee49184a8aee98f60b744890f5bb (patch)
treebadc77e3f0fc036888766b39386be0e595551472
parent6f6cd77a50fd4ffff360d4aee1c6bc05bfb802c1 (diff)
downloadgit-repo-2b5b4ac29275ee49184a8aee98f60b744890f5bb.tar.gz
Disable SSH ControlMaster option on Cygwin
Bug: REPO-29 Signed-off-by: Shawn O. Pearce <sop@google.com>
-rw-r--r--git_config.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/git_config.py b/git_config.py
index 53b52c85..45264611 100644
--- a/git_config.py
+++ b/git_config.py
@@ -346,7 +346,7 @@ def _open_ssh(host, port):
346 346
347 if not _ssh_master \ 347 if not _ssh_master \
348 or 'GIT_SSH' in os.environ \ 348 or 'GIT_SSH' in os.environ \
349 or sys.platform == 'win32': 349 or sys.platform in ('win32', 'cygwin'):
350 # failed earlier, or cygwin ssh can't do this 350 # failed earlier, or cygwin ssh can't do this
351 # 351 #
352 return False 352 return False