summaryrefslogtreecommitdiff
path: root/Assistant/Sync.hs
diff options
context:
space:
mode:
Diffstat (limited to 'Assistant/Sync.hs')
-rw-r--r--Assistant/Sync.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/Assistant/Sync.hs b/Assistant/Sync.hs
index 91ee1c219..59aa6205c 100644
--- a/Assistant/Sync.hs
+++ b/Assistant/Sync.hs
@@ -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