summaryrefslogtreecommitdiff
path: root/Command
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-10-04 18:04:09 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-10-04 18:04:09 -0400
commitcedb6dc503441bfe54881ec646d86dd777635e7d (patch)
tree7643d8ca5248b750b99b7c6aeaea4205137127fc /Command
parent929f2a0df8f76caa21f94ea3afe8afc1d2dba14e (diff)
make a pipeReadStrict, that properly waits on the process
Nearly everything that's reading from git is operating on a small amount of output and has been switched to use that. Only pipeNullSplit stuff continues using the lazy version that yields zombies.
Diffstat (limited to 'Command')
-rw-r--r--Command/Uninit.hs2
-rw-r--r--Command/Unused.hs2
2 files changed, 2 insertions, 2 deletions
diff --git a/Command/Uninit.hs b/Command/Uninit.hs
index 46a2480e6..6ac3e1216 100644
--- a/Command/Uninit.hs
+++ b/Command/Uninit.hs
@@ -32,7 +32,7 @@ check = do
error "can only run uninit from the top of the git repository"
where
current_branch = Git.Ref . Prelude.head . lines <$> revhead
- revhead = inRepo $ Git.Command.pipeRead
+ revhead = inRepo $ Git.Command.pipeReadStrict
[Params "rev-parse --abbrev-ref HEAD"]
seek :: [CommandSeek]
diff --git a/Command/Unused.hs b/Command/Unused.hs
index 91b21afa5..6fb8f36c6 100644
--- a/Command/Unused.hs
+++ b/Command/Unused.hs
@@ -251,7 +251,7 @@ withKeysReferencedInGit a = do
rs <- relevantrefs <$> showref
forM_ rs (withKeysReferencedInGitRef a)
where
- showref = inRepo $ Git.Command.pipeRead [Param "show-ref"]
+ showref = inRepo $ Git.Command.pipeReadStrict [Param "show-ref"]
relevantrefs = map (Git.Ref . snd) .
nubBy uniqref .
filter ourbranches .