From 54064162348decd9a64e60c479b63dcb6a80665e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 28 Oct 2012 15:33:21 -0400 Subject: [PATCH] add git-annex branch commit when assistant is syncing Seems nothing else ensures the branch is committed anymore. --- Assistant/Sync.hs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Assistant/Sync.hs b/Assistant/Sync.hs index e332d78565..8a9cf89855 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