diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-10-20 17:50:51 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-10-20 17:50:51 -0400 |
| commit | 66ccc37a99994f1206d308c0c0003ac2605d3c42 (patch) | |
| tree | 17fd97ca91a7c963cf80ac1274c94ac841e8572c /Git/Command.hs | |
| parent | 66e2c6e3a16480e25f82ef447cfebac16997aac5 (diff) | |
git-recover-repository 1/2 done
Diffstat (limited to 'Git/Command.hs')
| -rw-r--r-- | Git/Command.hs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Git/Command.hs b/Git/Command.hs index 9d05e0d17..8b027d2c3 100644 --- a/Git/Command.hs +++ b/Git/Command.hs @@ -1,6 +1,6 @@ {- running git commands - - - Copyright 2010-2012 Joey Hess <joey@kitenet.net> + - Copyright 2010-2013 Joey Hess <joey@kitenet.net> - - Licensed under the GNU GPL version 3 or higher. -} @@ -85,13 +85,13 @@ pipeReadStrict params repo = assertLocal repo $ where p = gitCreateProcess params repo -{- Runs a git command, feeding it input, and returning its output, +{- Runs a git command, feeding it an input, and returning its output, - which is expected to be fairly small, since it's all read into memory - strictly. -} -pipeWriteRead :: [CommandParam] -> String -> Repo -> IO String -pipeWriteRead params s repo = assertLocal repo $ +pipeWriteRead :: [CommandParam] -> Maybe (Handle -> IO ()) -> Repo -> IO String +pipeWriteRead params writer repo = assertLocal repo $ writeReadProcessEnv "git" (toCommand $ gitCommandLine params repo) - (gitEnv repo) s (Just adjusthandle) + (gitEnv repo) writer (Just adjusthandle) where adjusthandle h = do fileEncoding h |