unannex: Commit staged changes at end

to avoid some confusing behavior with the pre-commit hook, which would see
some types of commits after an unannex as checking in of an unlocked file.

1 files changed, 6 insertions, 1 deletions

diff --git a/Command/Unannex.hs b/Command/Unannex.hs
index 413443969..3810cca1c 100644
--- a/Command/Unannex.hs
+++ b/Command/Unannex.hs
@@ -55,5 +55,10 @@ cleanup file key = do
 
 	fromAnnex key file
 	logStatus key ValueMissing
-
+	
+	-- 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.
+	Annex.queue "commit" ["-m", "content removed from git annex"] "--"
+	
 	return True