run git coprocesses with gitEnv
This commit is contained in:
parent
e1baf48d88
commit
0b63ee6cd5
6 changed files with 12 additions and 6 deletions
|
@ -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"
|
||||
]
|
||||
|
|
|
@ -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 =
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue