have onLocal stop any coprocesses, not only cat-file

I have not seen any other coprocesses being started, but let's avoid
problems if any do for whatever reason.

1 files changed, 9 insertions, 7 deletions

diff --git a/Annex/Concurrent.hs b/Annex/Concurrent.hs
index ee19d4766..71a70fa5b 100644
--- a/Annex/Concurrent.hs
+++ b/Annex/Concurrent.hs
@@ -56,14 +56,16 @@ dupState = do
  - Also closes various handles in it. -}
 mergeState :: AnnexState -> Annex ()
 mergeState st = do
-	st' <- liftIO $ snd <$> run st closehandles
+	st' <- liftIO $ snd <$> run st stopCoProcesses
 	forM_ (M.toList $ Annex.cleanup st') $
 		uncurry addCleanup
 	Annex.Queue.mergeFrom st'
 	changeState $ \s -> s { errcounter = errcounter s + errcounter st' }
-  where
-	closehandles = do
-		catFileStop
-		checkAttrStop
-		hashObjectStop
-		checkIgnoreStop
+
+{- Stops all long-running git query processes. -}
+stopCoProcesses :: Annex ()
+stopCoProcesses = do
+	catFileStop
+	checkAttrStop
+	hashObjectStop
+	checkIgnoreStop