summaryrefslogtreecommitdiff
path: root/Command/Unannex.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-07-14 16:56:06 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-07-14 17:15:37 -0400
commitded259112449f592bc42207e89c82268f3795f12 (patch)
tree6a3e624445cbd063e32f3f0247a552f0ff47074a /Command/Unannex.hs
parent0c46cbab09af8cc8761668885e58944d397b856d (diff)
unannex: Clean up use of git commit -a.
This was more complex than would be expected. unannex has to use git commit -a since it's removing files from git; git commit filelist won't do. Allow commands to be added to the Git queue that have no associated files, and run such commands once.
Diffstat (limited to 'Command/Unannex.hs')
-rw-r--r--Command/Unannex.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Command/Unannex.hs b/Command/Unannex.hs
index f22503ee0..d3623ed99 100644
--- a/Command/Unannex.hs
+++ b/Command/Unannex.hs
@@ -78,6 +78,6 @@ cleanup file key = do
-- Commit staged changes at end to avoid confusing the
-- pre-commit hook if this file is later added back to
-- git as a normal, non-annexed file.
- AnnexQueue.add "commit" [Params "-a -m", Param "content removed from git annex"] "-a"
+ AnnexQueue.add "commit" [Params "-a -m", Param "content removed from git annex"] []
return True