diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-02-25 14:09:39 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-02-25 14:48:50 -0400 |
| commit | f55d91cc91eec2debf4bb013ff2f5201ea1474ea (patch) | |
| tree | 8b8701608fef4f49622018f26706ebd46bfae943 /Git | |
| parent | c3aaa702c8fe4424dacfddfc255fca8d6149ad06 (diff) | |
fix all remaining -Wall warnings on Windows
Diffstat (limited to 'Git')
| -rw-r--r-- | Git/Command.hs | 3 | ||||
| -rw-r--r-- | Git/Queue.hs | 11 |
2 files changed, 6 insertions, 8 deletions
diff --git a/Git/Command.hs b/Git/Command.hs index 0fa3d1b3b..a0c7c4b2a 100644 --- a/Git/Command.hs +++ b/Git/Command.hs @@ -15,9 +15,6 @@ import Common import Git import Git.Types import qualified Utility.CoProcess as CoProcess -#ifdef mingw32_HOST_OS -import Git.FilePath -#endif import Utility.Batch {- Constructs a git command line operating on the specified repo. -} diff --git a/Git/Queue.hs b/Git/Queue.hs index 9bb7f77d1..7f8724c8d 100644 --- a/Git/Queue.hs +++ b/Git/Queue.hs @@ -17,16 +17,17 @@ module Git.Queue ( flush, ) where -import qualified Data.Map as M -import System.IO -import System.Process - import Utility.SafeCommand import Common import Git import Git.Command import qualified Git.UpdateIndex +import qualified Data.Map as M +#ifndef mingw32_HOST_OS +import System.Process +#endif + {- Queable actions that can be performed in a git repository. -} data Action @@ -149,6 +150,7 @@ runAction repo (UpdateIndexAction streamers) = Git.UpdateIndex.streamUpdateIndex repo $ reverse streamers runAction repo action@(CommandAction {}) = #ifndef mingw32_HOST_OS + let p = (proc "xargs" $ "-0":"git":toCommand gitparams) { env = gitEnv repo } withHandle StdinHandle createProcessSuccess p $ \h -> do fileEncoding h hPutStr h $ intercalate "\0" $ toCommand $ getFiles action @@ -162,6 +164,5 @@ runAction repo action@(CommandAction {}) = void $ boolSystem "git" (gitparams ++ [f]) #endif where - p = (proc "xargs" $ "-0":"git":toCommand gitparams) { env = gitEnv repo } gitparams = gitCommandLine (Param (getSubcommand action):getParams action) repo |