diff options
Diffstat (limited to 'Command')
| -rw-r--r-- | Command/Merge.hs | 2 | ||||
| -rw-r--r-- | Command/Sync.hs | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/Command/Merge.hs b/Command/Merge.hs index c1f7e899a..0f4661497 100644 --- a/Command/Merge.hs +++ b/Command/Merge.hs @@ -26,4 +26,6 @@ start = do perform :: CommandPerform perform = do Annex.Branch.update + -- commit explicitly, in case no remote branches were merged + Annex.Branch.commit "update" next $ return True diff --git a/Command/Sync.hs b/Command/Sync.hs index 8e237ae84..f7ebba6f5 100644 --- a/Command/Sync.hs +++ b/Command/Sync.hs @@ -75,6 +75,7 @@ commit = do showStart "commit" "" next $ next $ do showOutput + Annex.Branch.commit "update" -- Commit will fail when the tree is clean, so ignore failure. _ <- inRepo $ Git.Command.runBool "commit" [Param "-a", Param "-m", Param "git-annex automatic sync"] |