diff options
| -rw-r--r-- | Annex/Ssh.hs | 3 | ||||
| -rw-r--r-- | debian/changelog | 2 |
2 files changed, 4 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. diff --git a/debian/changelog b/debian/changelog index 8dffeca12..8af9120b4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,8 @@ git-annex (4.20130228) UNRELEASED; urgency=low * Bugfix: If the UUID of a remote is not known, prevent --from, --to, and other ways of specifying remotes by name from selecting it, since it is not possible to sanely use it. + * Run ssh with -T to avoid tty allocation and any login scripts that + may do undesired things with it. -- Joey Hess <joeyh@debian.org> Wed, 27 Feb 2013 23:20:40 -0400 |