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 /Command | |
| 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 'Command')
| -rw-r--r-- | Command/Sync.hs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Command/Sync.hs b/Command/Sync.hs index ddd4e0309..16932b87c 100644 --- a/Command/Sync.hs +++ b/Command/Sync.hs @@ -234,8 +234,9 @@ pullRemote remote branch = do stopUnless fetch $ next $ mergeRemote remote branch where - fetch = inRepoWithSshCachingTo (Remote.repo remote) $ Git.Command.runBool - [Param "fetch", Param $ Remote.name remote] + fetch = inRepoWithSshOptionsTo (Remote.repo remote) (Remote.gitconfig remote) $ + Git.Command.runBool + [Param "fetch", Param $ Remote.name remote] {- The remote probably has both a master and a synced/master branch. - Which to merge from? Well, the master has whatever latest changes @@ -270,7 +271,7 @@ pushRemote remote (Just branch) = go =<< needpush showStart "push" (Remote.name remote) next $ next $ do showOutput - ok <- inRepoWithSshCachingTo (Remote.repo remote) $ + ok <- inRepoWithSshOptionsTo (Remote.repo remote) (Remote.gitconfig remote) $ pushBranch remote branch unless ok $ do warning $ unwords [ "Pushing to " ++ Remote.name remote ++ " failed." ] |