aboutsummaryrefslogtreecommitdiff
path: root/Assistant/Sync.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-10-28 15:33:21 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-10-28 15:33:21 -0400
commitfce32440a51e51f53022b4025fa005e52525a100 (patch)
treea72ed3d840a4373ad541816d8fa77d84c8f6294c /Assistant/Sync.hs
parentef8c4afd050cc729819b97a1f8864f613b6debbd (diff)
add git-annex branch commit when assistant is syncing
Seems nothing else ensures the branch is committed anymore.
Diffstat (limited to 'Assistant/Sync.hs')
-rw-r--r--Assistant/Sync.hs10
1 files changed, 6 insertions, 4 deletions
diff --git a/Assistant/Sync.hs b/Assistant/Sync.hs
index e332d7856..8a9cf8985 100644
--- a/Assistant/Sync.hs
+++ b/Assistant/Sync.hs
@@ -83,10 +83,12 @@ reconnectRemotes threadname st dstatus scanremotes pushnotifier rs = void $
-}
pushToRemotes :: ThreadName -> UTCTime -> ThreadState -> Maybe PushNotifier -> Maybe FailedPushMap -> [Remote] -> IO Bool
pushToRemotes threadname now st mpushnotifier mpushmap remotes = do
- (g, branch, u) <- runThreadState st $ (,,)
- <$> gitRepo
- <*> inRepo Git.Branch.current
- <*> getUUID
+ (g, branch, u) <- runThreadState st $ do
+ Annex.Branch.commit "update"
+ (,,)
+ <$> gitRepo
+ <*> inRepo Git.Branch.current
+ <*> getUUID
go True branch g u remotes
where
go _ Nothing _ _ _ = return True -- no branch, so nothing to do