summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-02-13 20:01:37 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-02-13 20:01:37 -0400
commitcad8824852aa0623dc41eac02a9e2bae47d88ec4 (patch)
tree6ac635a1ec9dbda1ca71b0e645a22c56149b41d0
parent0ef6d86873f55e487be5660a9bb24cb767a06993 (diff)
thinko
I removed the now unnecessary forkProcess, but forgot to change back to pipeBoth, so there was no writer thread.
-rw-r--r--Git/CheckAttr.hs7
1 files changed, 3 insertions, 4 deletions
diff --git a/Git/CheckAttr.hs b/Git/CheckAttr.hs
index 3e9375159..5c747a951 100644
--- a/Git/CheckAttr.hs
+++ b/Git/CheckAttr.hs
@@ -16,10 +16,9 @@ import qualified Git.Version
lookup :: String -> [FilePath] -> Repo -> IO [(FilePath, String)]
lookup attr files repo = do
cwd <- getCurrentDirectory
- (_, fromh, toh) <- hPipeBoth "git" (toCommand params)
- hPutStr toh $ join "\0" $ input cwd
- hClose toh
- zip files . map attrvalue . lines <$> hGetContents fromh
+ (_, r) <- pipeBoth "git" (toCommand params) $
+ join "\0" $ input cwd
+ return $ zip files $ map attrvalue $ lines r
where
params = gitCommandLine
[ Param "check-attr"