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 /RemoteDaemon/Transport | |
| 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 'RemoteDaemon/Transport')
| -rw-r--r-- | RemoteDaemon/Transport/Ssh.hs | 8 |
1 files changed, 4 insertions, 4 deletions
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 |