summaryrefslogtreecommitdiff
path: root/Remote
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-05-20 00:14:56 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-05-20 00:14:56 -0400
commit37ef39c9295fd5f036264791e201262b0e641f85 (patch)
treef1e973292c1adf2c1f33b869c71a26a0d1117c49 /Remote
parentebbd24e5ed6bbb41305d8105d7fac355dcf15bbc (diff)
suppress "(Recording state in git)" message when committing change to remote state
This was shown redundantly for a tricky reason -- while it runs inside a doSideAction block that would appear to supress it, the action being run is in a different state monad; for the remote, and so the suppression doesn't work. Always suppressing the message when committing to a local remote is ok do to though -- it mirrors the /dev/nulling of the git annex shell commit output. And it turns out that any time there is a git-annex branch state change to commit on the remote, the local repo has also had a similar change made, and so the message has been shown already.
Diffstat (limited to 'Remote')
-rw-r--r--Remote/Git.hs3
1 files changed, 2 insertions, 1 deletions
diff --git a/Remote/Git.hs b/Remote/Git.hs
index 79439b784..cf7542d74 100644
--- a/Remote/Git.hs
+++ b/Remote/Git.hs
@@ -310,7 +310,8 @@ commitOnCleanup r a = go `after` a
go = Annex.addCleanup (Git.repoLocation r) cleanup
cleanup
| not $ Git.repoIsUrl r = liftIO $ onLocal r $
- Annex.Branch.commit "update"
+ doQuietSideAction $
+ Annex.Branch.commit "update"
| otherwise = void $ do
Just (shellcmd, shellparams) <-
git_annex_shell r "commit" []