From 13514b6afc6cb043dfa742dd0e69efca7a4374df Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 1 Nov 2010 21:21:13 -0400
Subject: fix checkAttr to not deadlock and not need strictness

Yeah, "will never deadlock" is never a good sign in code comments. ;)
---
 GitRepo.hs | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'GitRepo.hs')

diff --git a/GitRepo.hs b/GitRepo.hs
index e8dd0a5dc..bc6d45066 100644
--- a/GitRepo.hs
+++ b/GitRepo.hs
@@ -149,17 +149,12 @@ attributes repo
 {- Looks up a gitattributes value for each file in a list. -}
 checkAttr :: Repo -> String -> [FilePath] -> IO [(FilePath, String)]
 checkAttr repo attr files = do
-	(pid, fromh, toh) <- hPipeBoth "git" $
-		gitCommandLine repo ["check-attr", attr, "-z", "--stdin"]
-	-- git-check-attr reads all its stdin before outputting anything,
-	-- so we don't need to worry about deadlock
-	hPutStr toh files0
-	hClose toh
-	c <- hGetContentsStrict fromh
-	hClose fromh
-	forceSuccess pid
-	return $ map topair $ lines c
+	(handle, s) <- pipeBoth "git" params files0
+	return $ map topair $ lines s
+	-- XXX handle is left open, this is ok for git-annex, but may need
+	-- to be cleaned up for other uses.
 	where
+		params = gitCommandLine repo ["check-attr", attr, "-z", "--stdin"]
 		files0 = join "\0" files
 		topair l = (bits !! 0, join sep $ drop 1 $ bits)
 			where 
-- 
cgit v1.2.3