run git coprocesses with gitEnv

Git/CatFile.hs

@@ -29,7 +29,7 @@ import qualified Utility.CoProcess as CoProcess
 type CatFileHandle = CoProcess.CoProcessHandle
 
 catFileStart :: Repo -> IO CatFileHandle
-catFileStart = CoProcess.start "git" . toCommand . gitCommandLine
+catFileStart = gitCoProcessStart
 	[ Param "cat-file"
 	, Param "--batch"
 	]

Git/CheckAttr.hs

@@ -22,7 +22,7 @@ type Attr = String
 checkAttrStart :: [Attr] -> Repo -> IO CheckAttrHandle
 checkAttrStart attrs repo = do
 	cwd <- getCurrentDirectory
-	h <- CoProcess.start "git" $ toCommand $ gitCommandLine params repo
+	h <- gitCoProcessStart params repo
 	return (h, attrs, cwd)
 	where
 		params =

Git/Command.hs

@@ -13,6 +13,7 @@ import System.Process
 import Common
 import Git
 import Git.Types
+import qualified Utility.CoProcess as CoProcess
 
 {- Constructs a git command line operating on the specified repo. -}
 gitCommandLine :: [CommandParam] -> Repo -> [CommandParam]
@@ -80,3 +81,7 @@ reap = do
 	-- throws an exception when there are no child processes
 	catchDefaultIO (getAnyProcessStatus False True) Nothing
 		>>= maybe noop (const reap)
+
+{- Runs a git command as a coprocess. -}
+gitCoProcessStart :: [CommandParam] -> Repo -> IO CoProcess.CoProcessHandle
+gitCoProcessStart params repo = CoProcess.start "git" (toCommand $ gitCommandLine params repo) (gitEnv repo)

Git/HashObject.hs

@@ -17,7 +17,7 @@ import qualified Utility.CoProcess as CoProcess
 type HashObjectHandle = CoProcess.CoProcessHandle
 
 hashObjectStart :: Repo -> IO HashObjectHandle
-hashObjectStart = CoProcess.start "git" . toCommand . gitCommandLine
+hashObjectStart = gitCoProcessStart
 	[ Param "hash-object"
 	, Param "-w"
 	, Param "--stdin-paths"

Utility/CoProcess.hs

@@ -17,9 +17,9 @@ import Common
 
 type CoProcessHandle = (ProcessHandle, Handle, Handle, CreateProcess)
 
-start :: FilePath -> [String] -> IO CoProcessHandle
-start command params = do
-	(from, to, _err, pid) <- runInteractiveProcess command params Nothing Nothing
+start :: FilePath -> [String] -> Maybe [(String, String)] -> IO CoProcessHandle
+start command params env = do
+	(from, to, _err, pid) <- runInteractiveProcess command params Nothing env
 	return (pid, to, from, proc command params)
 
 stop :: CoProcessHandle -> IO ()

Utility/Process.hs

@@ -233,5 +233,6 @@ runInteractiveProcess f args c e = do
 			{ std_in = CreatePipe
 			, std_out = CreatePipe
 			, std_err = CreatePipe
+			, env = e
 			}
 	System.Process.runInteractiveProcess f args c e