summaryrefslogtreecommitdiff
path: root/Remote
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-01-20 17:32:32 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-01-20 17:32:32 -0400
commiteb9001044f3db682236d1007aded58f47109d6a6 (patch)
treebacb884aa680a7126a66ed4826902f7eda79d01f /Remote
parent6ef82665de86195a7da6cffcba40874eba06424f (diff)
order user provided params after connection caching params
So the user can override them.
Diffstat (limited to 'Remote')
-rw-r--r--Remote/Helper/Ssh.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/Remote/Helper/Ssh.hs b/Remote/Helper/Ssh.hs
index 88b29fdb6..c61d1b96f 100644
--- a/Remote/Helper/Ssh.hs
+++ b/Remote/Helper/Ssh.hs
@@ -20,8 +20,8 @@ import Annex.Ssh
sshToRepo :: Git.Repo -> [CommandParam] -> Annex [CommandParam]
sshToRepo repo sshcmd = do
opts <- map Param . words <$> getConfig repo "ssh-options" ""
- params <- sshParams (Git.Url.hostuser repo, Git.Url.port repo)
- return $ opts ++ params ++ sshcmd
+ params <- sshParams (Git.Url.hostuser repo, Git.Url.port repo) opts
+ return $ params ++ sshcmd
{- Generates parameters to run a git-annex-shell command on a remote
- repository. -}