From 6533bb6281744c1494612adf609222eb215da5be Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 12 Feb 2015 16:12:32 -0400 Subject: 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. --- CmdLine/GitAnnex.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CmdLine') 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) ] -- cgit v1.2.3