aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Command/Sync.hs8
1 files changed, 5 insertions, 3 deletions
diff --git a/Command/Sync.hs b/Command/Sync.hs
index 0a8ed7827..066a12a56 100644
--- a/Command/Sync.hs
+++ b/Command/Sync.hs
@@ -80,8 +80,9 @@ syncRemotes rs = ifM (Annex.getState Annex.fast) ( nub <$> pickfast , wanted )
commit :: CommandStart
commit = next $ next $ do
ifM isDirect
- ( ifM stageDirect
- ( runcommit [] , return True )
+ ( do
+ void $ stageDirect
+ runcommit []
, runcommit [Param "-a"]
)
where
@@ -90,8 +91,9 @@ commit = next $ next $ do
showOutput
Annex.Branch.commit "update"
-- Commit will fail when the tree is clean, so ignore failure.
- _ <- inRepo $ Git.Command.runBool $ (Param "commit") : ps ++
+ let params = (Param "commit") : ps ++
[Param "-m", Param "git-annex automatic sync"]
+ _ <- inRepo $ tryIO . Git.Command.runQuiet params
return True
mergeLocal :: Git.Ref -> CommandStart