diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-06-27 20:30:04 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-06-27 20:30:04 -0400 |
| commit | 59b5266ad13efe465b67b31aba3b750c31fb83cd (patch) | |
| tree | d698dbf8ce9a769d66d2a41fcda7c4e9c74e5229 /Assistant/Threads/Merger.hs | |
| parent | 783bee285fd357b887de818918b181ea4628783a (diff) | |
actually fetch from remote when doing a manual pull
forgot to do this
Diffstat (limited to 'Assistant/Threads/Merger.hs')
| -rw-r--r-- | Assistant/Threads/Merger.hs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Assistant/Threads/Merger.hs b/Assistant/Threads/Merger.hs index 3659588fc..602bebb5b 100644 --- a/Assistant/Threads/Merger.hs +++ b/Assistant/Threads/Merger.hs @@ -12,9 +12,11 @@ import Assistant.ThreadedMonad import Utility.DirWatcher import Utility.Types.DirWatcher import qualified Git +import qualified Git.Command import qualified Git.Merge import qualified Git.Branch import qualified Command.Sync +import qualified Remote {- This thread watches for changes to .git/refs/heads/synced/*, - which indicate incoming pushes. It merges those pushes into the @@ -81,5 +83,6 @@ mergeBranch st branch repo = do - changes to us. That could be because it doesn't have us as a remote, or - because the assistant is not running there, or other reasons. -} manualPull :: Git.Ref -> [Remote] -> Annex () -manualPull currentbranch remotes = forM_ remotes $ \r -> +manualPull currentbranch remotes = forM_ remotes $ \r -> do + void $ inRepo $ Git.Command.runBool "fetch" [Param $ Remote.name r] Command.Sync.mergeRemote r currentbranch |