Revert "Windows: Ssh connection caching is now supported."
Yeah, that didn't actually work. Got error messages like it couldn't read from the control socket, so probably ssh doesn't really support that on Windows, at least the cygwin ssh build I'm using.
This commit is contained in:
parent
07a17f58b7
commit
1312cffad0
2 changed files with 7 additions and 6 deletions
12
Annex/Ssh.hs
12
Annex/Ssh.hs
|
@ -63,16 +63,18 @@ sshInfo (host, port) = go =<< sshCacheDir
|
|||
, Params "-o ControlMaster=auto -o ControlPersist=yes"
|
||||
]
|
||||
|
||||
{- ssh connection caching creates sockets, so will not work on all file
|
||||
- systems. A GIT_ANNEX_TMP_DIR can be provided to use
|
||||
{- ssh connection caching creates sockets, so will not work on a
|
||||
- crippled filesystem. A GIT_ANNEX_TMP_DIR can be provided to use
|
||||
- a different filesystem. -}
|
||||
sshCacheDir :: Annex (Maybe FilePath)
|
||||
sshCacheDir
|
||||
| SysConfig.sshconnectioncaching =
|
||||
ifM (fromMaybe True . annexSshCaching <$> Annex.getGitConfig)
|
||||
| SysConfig.sshconnectioncaching = ifM crippledFileSystem
|
||||
( maybe (return Nothing) usetmpdir =<< gettmpdir
|
||||
, ifM (fromMaybe True . annexSshCaching <$> Annex.getGitConfig)
|
||||
( Just <$> fromRepo gitAnnexSshDir
|
||||
, maybe (return Nothing) usetmpdir =<< gettmpdir
|
||||
, return Nothing
|
||||
)
|
||||
)
|
||||
| otherwise = return Nothing
|
||||
where
|
||||
gettmpdir = liftIO $ getEnv "GIT_ANNEX_TMP_DIR"
|
||||
|
|
1
debian/changelog
vendored
1
debian/changelog
vendored
|
@ -31,7 +31,6 @@ git-annex (4.20130602) UNRELEASED; urgency=low
|
|||
* annex.debug can now be set to enable debug logging by default.
|
||||
The webapp's debugging check box does this.
|
||||
* fsck: Avoid getting confused by Windows path separators
|
||||
* Windows: Ssh connection caching is now supported.
|
||||
|
||||
-- Joey Hess <joeyh@debian.org> Mon, 10 Jun 2013 12:52:44 -0400
|
||||
|
||||
|
|
Loading…
Reference in a new issue