diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-02-12 16:12:32 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-02-12 16:14:53 -0400 |
| commit | 6533bb6281744c1494612adf609222eb215da5be (patch) | |
| tree | 19d5341dec24c9f5113b02d1849f78f129befa7a /CmdLine/GitAnnex.hs | |
| parent | d1abee8f3ca83d48782df72406e81dc5e12a7595 (diff) | |
propigate ssh-options everywhere ssh caching is used
* sync: Use the ssh-options git config when doing git pull and push.
* remotedaemon: Use the ssh-options git config.
Note that the rename env var means that if a new git-annex calls an old one
for git-annex ssh, or a new calls an old, nothing much will go wrong;
just ssh caching won't happen.
Diffstat (limited to 'CmdLine/GitAnnex.hs')
| -rw-r--r-- | CmdLine/GitAnnex.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CmdLine/GitAnnex.hs b/CmdLine/GitAnnex.hs index 492e3c3e5..f794f8127 100644 --- a/CmdLine/GitAnnex.hs +++ b/CmdLine/GitAnnex.hs @@ -218,6 +218,6 @@ run args = do go [] = dispatch True args cmds gitAnnexOptions [] header Git.CurrentRepo.get go ((v, a):rest) = maybe (go rest) a =<< getEnv v envmodes = - [ (sshCachingEnv, runSshCaching args) + [ (sshOptionsEnv, runSshOptions args) , (sshAskPassEnv, runSshAskPass) ] |