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

use gitRepo

Browse source
This commit is contained in:
Joey Hess 2012-10-12 01:17:45 -04:00
parent a7642b3b6e
commit 549c779a38
7 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Assistant/Sync.hs
View file

@ -84,7 +84,7 @@ reconnectRemotes threadname st dstatus scanremotes rs = void $
pushToRemotes :: ThreadName -> UTCTime -> ThreadState -> Maybe FailedPushMap -> [Remote] -> IO Bool
pushToRemotes threadname now st mpushmap remotes = do
(g, branch, u) <- runThreadState st $ (,,)
<$> fromRepo id
<$> gitRepo
<*> inRepo Git.Branch.current
<*> getUUID
go True branch g u remotes
@ -145,7 +145,7 @@ pushToRemotes threadname now st mpushmap remotes = do
{- Manually pull from remotes and merge their branches. -}
manualPull :: ThreadState -> Maybe Git.Ref -> [Remote] -> IO Bool
manualPull st currentbranch remotes = do
g <- runThreadState st $ fromRepo id
g <- runThreadState st gitRepo
forM_ remotes $ \r ->
Git.Command.runBool "fetch" [Param $ Remote.name r] g
haddiverged <- runThreadState st Annex.Branch.forceUpdate