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.

5 files changed, 6 insertions, 6 deletions

diff --git a/Command/Add.hs b/Command/Add.hs
index 5c7cad044..51b95b9b5 100644
--- a/Command/Add.hs
+++ b/Command/Add.hs
@@ -87,6 +87,6 @@ cleanup file key = do
 
 	force <- Annex.getState Annex.force
 	if force
-		then AnnexQueue.add "add" [Param "-f", Param "--"] file
-		else AnnexQueue.add "add" [Param "--"] file
+		then AnnexQueue.add "add" [Param "-f", Param "--"] [file]
+		else AnnexQueue.add "add" [Param "--"] [file]
 	return True
diff --git a/Command/Fix.hs b/Command/Fix.hs
index 60627e9df..47b0c4c9a 100644
--- a/Command/Fix.hs
+++ b/Command/Fix.hs
@@ -44,5 +44,5 @@ perform file link = do
 
 cleanup :: FilePath -> CommandCleanup
 cleanup file = do
-	AnnexQueue.add "add" [Param "--"] file
+	AnnexQueue.add "add" [Param "--"] [file]
 	return True
diff --git a/Command/FromKey.hs b/Command/FromKey.hs
index fb9ab0775..d59f1de39 100644
--- a/Command/FromKey.hs
+++ b/Command/FromKey.hs
@@ -45,5 +45,5 @@ perform file = do
 
 cleanup :: FilePath -> CommandCleanup
 cleanup file = do
-	AnnexQueue.add "add" [Param "--"] file
+	AnnexQueue.add "add" [Param "--"] [file]
 	return True
diff --git a/Command/Lock.hs b/Command/Lock.hs
index e55cd9e79..d39df5f33 100644
--- a/Command/Lock.hs
+++ b/Command/Lock.hs
@@ -33,5 +33,5 @@ perform file = do
 	-- Checkout from HEAD to get rid of any changes that might be 
 	-- staged in the index, and get back to the previous symlink to
 	-- the content.
-	AnnexQueue.add "checkout" [Param "HEAD", Param "--"] file
+	AnnexQueue.add "checkout" [Param "HEAD", Param "--"] [file]
 	next $ return True -- no cleanup needed
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