From 9449328604e38fbba7ea5c02578e0f7e85f803d9 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 16 Oct 2012 21:06:33 -0400
Subject: Fix zombie cleanup reversion introduced in 3.20121009.

---
 Command.hs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'Command.hs')

diff --git a/Command.hs b/Command.hs
index 8e7bf9758..145ad5003 100644
--- a/Command.hs
+++ b/Command.hs
@@ -39,6 +39,7 @@ import Usage as ReExported
 import Logs.Trust
 import Config
 import Annex.CheckAttr
+import qualified Git.Command
 
 {- Generates a normal command -}
 command :: String -> String -> [CommandSeek] -> String -> Command
@@ -83,11 +84,14 @@ doCommand = start
 	where
 		start   = stage $ maybe skip perform
 		perform = stage $ maybe failure cleanup
-		cleanup = stage $ status
+		cleanup = stage $ end
 		stage = (=<<)
 		skip = return True
 		failure = showEndFail >> return False
-		status r = showEndResult r >> return r
+		end r = do
+			-- zombies from long-running git processes
+			liftIO Git.Command.reap
+			showEndResult r >> return r
 
 {- Modifies an action to only act on files that are already annexed,
  - and passes the key and backend on to it. -}
-- 
cgit v1.2.3