diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-11-17 12:56:27 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-11-17 12:56:27 -0400 |
| commit | 3a6c9ad7d00c6795faefcacbc42dc57d26aecd61 (patch) | |
| tree | a03564275f6a9532fe487353c04b1c0cf7659a0d /Assistant/Sync.hs | |
| parent | a5584e1a61861dff0835f7ea4e366e393c0fd294 (diff) | |
| parent | 2286c5acb4b3917a71067264cc1075638848d340 (diff) | |
Merge branch 'master' into tor
Diffstat (limited to 'Assistant/Sync.hs')
| -rw-r--r-- | Assistant/Sync.hs | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/Assistant/Sync.hs b/Assistant/Sync.hs index 9b9e7ebe5..ff34c0656 100644 --- a/Assistant/Sync.hs +++ b/Assistant/Sync.hs @@ -21,7 +21,6 @@ import Utility.Parallel import qualified Git import qualified Git.Command import qualified Git.Ref -import qualified Git.Merge import qualified Remote import qualified Types.Remote as Remote import qualified Remote.List as Remote @@ -239,19 +238,12 @@ manualPull currentbranch remotes = do ) haddiverged <- liftAnnex Annex.Branch.forceUpdate forM_ normalremotes $ \r -> - liftAnnex $ Command.Sync.mergeRemote r currentbranch mergeConfig + liftAnnex $ Command.Sync.mergeRemote r currentbranch Command.Sync.mergeConfig u <- liftAnnex getUUID forM_ xmppremotes $ \r -> sendNetMessage $ Pushing (getXMPPClientID r) (PushRequest u) return (catMaybes failed, haddiverged) -mergeConfig :: [Git.Merge.MergeConfig] -mergeConfig = - [ Git.Merge.MergeNonInteractive - -- Pairing involves merging unrelated histories - , Git.Merge.MergeUnrelatedHistories - ] - {- Start syncing a remote, using a background thread. -} syncRemote :: Remote -> Assistant () syncRemote remote = do |