diff options
| -rw-r--r-- | Annex/Ssh.hs | 12 | ||||
| -rw-r--r-- | debian/changelog | 1 |
2 files changed, 6 insertions, 7 deletions
diff --git a/Annex/Ssh.hs b/Annex/Ssh.hs index 940cbb5a7..99b3c4435 100644 --- a/Annex/Ssh.hs +++ b/Annex/Ssh.hs @@ -63,18 +63,16 @@ sshInfo (host, port) = go =<< sshCacheDir , Params "-o ControlMaster=auto -o ControlPersist=yes" ] -{- ssh connection caching creates sockets, so will not work on a - - crippled filesystem. A GIT_ANNEX_TMP_DIR can be provided to use +{- ssh connection caching creates sockets, so will not work on all file + - systems. A GIT_ANNEX_TMP_DIR can be provided to use - a different filesystem. -} sshCacheDir :: Annex (Maybe FilePath) sshCacheDir - | SysConfig.sshconnectioncaching = ifM crippledFileSystem - ( maybe (return Nothing) usetmpdir =<< gettmpdir - , ifM (fromMaybe True . annexSshCaching <$> Annex.getGitConfig) + | SysConfig.sshconnectioncaching = + ifM (fromMaybe True . annexSshCaching <$> Annex.getGitConfig) ( Just <$> fromRepo gitAnnexSshDir - , return Nothing + , maybe (return Nothing) usetmpdir =<< gettmpdir ) - ) | otherwise = return Nothing where gettmpdir = liftIO $ getEnv "GIT_ANNEX_TMP_DIR" diff --git a/debian/changelog b/debian/changelog index a31d5c457..246192e77 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,6 +31,7 @@ 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 |