diff options
| -rw-r--r-- | subversion/libsvn_ra_svn/client.c | 2 | ||||
| -rw-r--r-- | subversion/libsvn_subr/config_file.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/subversion/libsvn_ra_svn/client.c b/subversion/libsvn_ra_svn/client.c index ab1aa58..164cc76 100644 --- a/subversion/libsvn_ra_svn/client.c +++ b/subversion/libsvn_ra_svn/client.c @@ -399,7 +399,7 @@ static svn_error_t *find_tunnel_agent(const char *tunnel, * versions have it too. If the user is using some other ssh * implementation that doesn't accept it, they can override it * in the [tunnels] section of the config. */ - val = "$SVN_SSH ssh -q --"; + val = "$SVN_SSH ssh -q -o ControlMaster=no --"; } if (!val || !*val) diff --git a/subversion/libsvn_subr/config_file.c b/subversion/libsvn_subr/config_file.c index bd2ec82..5014de6 100644 --- a/subversion/libsvn_subr/config_file.c +++ b/subversion/libsvn_subr/config_file.c @@ -1449,7 +1449,7 @@ svn_config_ensure(const char *config_dir, apr_pool_t *pool) "### passed to the tunnel agent as <user>@<hostname>.) If the" NL "### built-in ssh scheme were not predefined, it could be defined" NL "### as:" NL - "# ssh = $SVN_SSH ssh -q --" NL + "# ssh = $SVN_SSH ssh -q -o ControlMaster=no --" NL "### If you wanted to define a new 'rsh' scheme, to be used with" NL "### 'svn+rsh:' URLs, you could do so as follows:" NL "# rsh = rsh --" NL |