summaryrefslogtreecommitdiff
path: root/Annex
diff options
context:
space:
mode:
Diffstat (limited to 'Annex')
-rw-r--r--Annex/Ssh.hs6
1 files changed, 5 insertions, 1 deletions
diff --git a/Annex/Ssh.hs b/Annex/Ssh.hs
index 43c2c13a9..4377de4c5 100644
--- a/Annex/Ssh.hs
+++ b/Annex/Ssh.hs
@@ -56,8 +56,12 @@ sshOptions (host, port) gc opts = go =<< sshCachingInfo (host, port)
-- If it did, a more expensive test would be needed.
liftIO $ unlessM (doesFileExist overideconfigfile) $
viaTmp writeFile overideconfigfile $ unlines
+ -- Make old version of ssh that does
+ -- not know about Include ignore those
+ -- entries.
+ [ "IgnoreUnknown Include"
-- ssh expands "~"
- [ "Include ~/.ssh/config"
+ , "Include ~/.ssh/config"
-- ssh will silently skip the file
-- if it does not exist
, "Include /etc/ssh/ssh_config"