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/Core.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 'RemoteDaemon/Core.hs')
| -rw-r--r-- | RemoteDaemon/Core.hs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/RemoteDaemon/Core.hs b/RemoteDaemon/Core.hs index bc5ad8a58..405a1fd88 100644 --- a/RemoteDaemon/Core.hs +++ b/RemoteDaemon/Core.hs @@ -117,14 +117,16 @@ genRemoteMap h@(TransportHandle g _) ochan = gen r = case Git.location r of Git.Url u -> case M.lookup (uriScheme u) remoteTransports of Just transport - | remoteAnnexSync (extractRemoteGitConfig r (Git.repoDescribe r)) -> do + | remoteAnnexSync gc -> do ichan <- newTChanIO :: IO (TChan Consumed) return $ Just ( r - , (transport r (RemoteURI u) h ichan ochan, ichan) + , (transport (RemoteRepo r gc) (RemoteURI u) h ichan ochan, ichan) ) _ -> return Nothing _ -> return Nothing + where + gc = extractRemoteGitConfig r (Git.repoDescribe r) genTransportHandle :: IO TransportHandle genTransportHandle = do |