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. --- RemoteDaemon/Transport/Ssh.hs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'RemoteDaemon/Transport') diff --git a/RemoteDaemon/Transport/Ssh.hs b/RemoteDaemon/Transport/Ssh.hs index 509b8f319..bdf4f54f0 100644 --- a/RemoteDaemon/Transport/Ssh.hs +++ b/RemoteDaemon/Transport/Ssh.hs @@ -22,13 +22,13 @@ import Control.Concurrent.STM import Control.Concurrent.Async transport :: Transport -transport r url h@(TransportHandle g s) ichan ochan = do +transport rr@(RemoteRepo r gc) url h@(TransportHandle g s) ichan ochan = do -- enable ssh connection caching wherever inLocalRepo is called - g' <- liftAnnex h $ sshCachingTo r g - transport' r url (TransportHandle g' s) ichan ochan + g' <- liftAnnex h $ sshOptionsTo r gc g + transport' rr url (TransportHandle g' s) ichan ochan transport' :: Transport -transport' r url transporthandle ichan ochan = do +transport' (RemoteRepo r _) url transporthandle ichan ochan = do v <- liftAnnex transporthandle $ git_annex_shell r "notifychanges" [] [] case v of -- cgit v1.2.3