aboutsummaryrefslogtreecommitdiff
path: root/Git/LsTree.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-10-04 18:47:31 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-10-04 18:47:31 -0400
commit743c35709de77055a3e4947d673219569cd57fb4 (patch)
tree6133ddd1497576198df35ae66df27a9416129454 /Git/LsTree.hs
parentcedb6dc503441bfe54881ec646d86dd777635e7d (diff)
more zombie fighting
I'm down to 9 places in the code that can produce unwaited for zombies. Most of these are pretty innocuous, at least for now, are only used in short-running commands, or commands that run a set of actions and explicitly reap zombies after each one. The one from Annex.Branch.files could be trouble later, since both Command.Fsck and Command.Unused can trigger it, and the assistant will be doing those eventally. Ditto the one in Git.LsTree.lsTree, which Command.Unused uses. The only ones currently affecting the assistant though, are in Git.LsFiles. Several threads use several of those. (And yeah, using pipes or ResourceT would be a less ad-hoc approach, but I don't really feel like ripping my entire code base apart right now to change a foundation monad. Maybe one of these days..)
Diffstat (limited to 'Git/LsTree.hs')
-rw-r--r--Git/LsTree.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Git/LsTree.hs b/Git/LsTree.hs
index 8f9066f0f..dc03b8896 100644
--- a/Git/LsTree.hs
+++ b/Git/LsTree.hs
@@ -30,7 +30,7 @@ data TreeItem = TreeItem
{- Lists the contents of a Ref -}
lsTree :: Ref -> Repo -> IO [TreeItem]
lsTree t repo = map parseLsTree <$>
- pipeNullSplit [Params "ls-tree --full-tree -z -r --", File $ show t] repo
+ pipeNullSplitZombie [Params "ls-tree --full-tree -z -r --", File $ show t] repo
{- Parses a line of ls-tree output.
- (The --long format is not currently supported.) -}