summaryrefslogtreecommitdiff
path: root/Command
diff options
context:
space:
mode:
Diffstat (limited to 'Command')
-rw-r--r--Command/PostReceive.hs13
1 files changed, 9 insertions, 4 deletions
diff --git a/Command/PostReceive.hs b/Command/PostReceive.hs
index 84652f20d..ffb5516a2 100644
--- a/Command/PostReceive.hs
+++ b/Command/PostReceive.hs
@@ -13,11 +13,16 @@ import Git.Types
import Annex.UpdateInstead
import Command.Sync (mergeLocal, prepMerge, mergeConfig, getCurrBranch)
+-- This does not need to modify the git-annex branch to update the
+-- work tree, but auto-initialization might change the git-annex branch.
+-- Since it would be surprising for a post-receive hook to make such a
+-- change, that's prevented by noCommit.
cmd :: Command
-cmd = command "post-receive" SectionPlumbing
- "run by git post-receive hook"
- paramNothing
- (withParams seek)
+cmd = noCommit $
+ command "post-receive" SectionPlumbing
+ "run by git post-receive hook"
+ paramNothing
+ (withParams seek)
seek :: CmdParams -> CommandSeek
seek _ = whenM needUpdateInsteadEmulation $ do