diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-12-24 14:48:51 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-12-24 15:01:55 -0400 |
| commit | 42e08cd4575d3dc558dfe172c1f28c752d69e8c6 (patch) | |
| tree | 78a8eddc31c390aaf8f66435bb13db9366f9a7c4 /Assistant/Sync.hs | |
| parent | 34f375526f44ff255d45bbabcd1425b3d5d0bb4a (diff) | |
| parent | 3b9d9a267b7c9247d36d9b622e1b836724ca5fb0 (diff) | |
Merge branch 'master' into no-xmpp
Diffstat (limited to 'Assistant/Sync.hs')
| -rw-r--r-- | Assistant/Sync.hs | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/Assistant/Sync.hs b/Assistant/Sync.hs index e46910ccd..3feed290e 100644 --- a/Assistant/Sync.hs +++ b/Assistant/Sync.hs @@ -19,6 +19,7 @@ import Utility.Parallel import qualified Git import qualified Git.Command import qualified Git.Merge +import qualified Git.Ref import qualified Remote import qualified Types.Remote as Remote import qualified Remote.List as Remote @@ -204,16 +205,9 @@ 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 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 |