summaryrefslogtreecommitdiff
path: root/Annex
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-03-04 23:36:07 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-03-04 23:36:07 -0400
commit5fccd04a5dc88f88a17b37edeed9d21df7c32897 (patch)
tree7aaa627e5722599cb42b918c8480901256c1d70c /Annex
parent6f4e0fa4a08b5abccbbfd363892f084faa6a2c39 (diff)
Run ssh with -T to avoid tty allocation and any login scripts that may do undesired things with it.
Diffstat (limited to 'Annex')
-rw-r--r--Annex/Ssh.hs3
1 files changed, 2 insertions, 1 deletions
diff --git a/Annex/Ssh.hs b/Annex/Ssh.hs
index d48038f97..a8bd1f7b6 100644
--- a/Annex/Ssh.hs
+++ b/Annex/Ssh.hs
@@ -33,7 +33,8 @@ sshParams (host, port) opts = go =<< sshInfo (host, port)
liftIO $ createDirectoryIfMissing True $ parentDir socketfile
lockFile $ socket2lock socketfile
ret params
- ret ps = return $ ps ++ opts ++ portParams port ++ [Param host]
+ ret ps = return $ ps ++ opts ++ portParams port ++
+ [Param "-T", Param host]
-- If the lock pool is empty, this is the first ssh of this
-- run. There could be stale ssh connections hanging around
-- from a previous git-annex run that was interrupted.