mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

actually fetch from remote when doing a manual pull

Browse source 
forgot to do this
This commit is contained in:
Joey Hess 2012-06-27 20:30:04 -04:00
parent 783bee285f
commit 59b5266ad1
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Assistant/Threads/Merger.hs
View file

@ -12,9 +12,11 @@ import Assistant.ThreadedMonad
import Utility.DirWatcher import Utility.DirWatcher
import Utility.Types.DirWatcher import Utility.Types.DirWatcher
import qualified Git import qualified Git
import qualified Git.Command
import qualified Git.Merge import qualified Git.Merge
import qualified Git.Branch import qualified Git.Branch
import qualified Command.Sync import qualified Command.Sync
import qualified Remote
{- This thread watches for changes to .git/refs/heads/synced/*, {- This thread watches for changes to .git/refs/heads/synced/*,
- which indicate incoming pushes. It merges those pushes into the - 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 - 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. -} - because the assistant is not running there, or other reasons. -}
manualPull :: Git.Ref -> [Remote] -> Annex () 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 Command.Sync.mergeRemote r currentbranch