summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-06-12 18:37:12 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-06-12 18:37:12 -0400
commit4152d6e2716ea0d7fc10dab45cf441818c252699 (patch)
tree147e2154aef3be2df02aadb2b7479211492f1f34
parentdb6559ce76c9a23a77eaa6e7af6f3bb4c849e021 (diff)
fix a test suite reversion on Windows
Forgot to pass gitEnv when running commands in the git queue on windows.
-rw-r--r--Git/Queue.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/Git/Queue.hs b/Git/Queue.hs
index 606a04157..2ec3a2b1e 100644
--- a/Git/Queue.hs
+++ b/Git/Queue.hs
@@ -156,9 +156,9 @@ runAction repo action@(CommandAction {}) = do
-- Using xargs on Windows is problimatic, so just run the command
-- once per file (not as efficient.)
if null (getFiles action)
- then void $ boolSystem "git" gitparams
+ then void $ boolSystemEnv "git" gitparams (gitEnv repo)
else forM_ (getFiles action) $ \f ->
- void $ boolSystem "git" (gitparams ++ [f])
+ void $ boolSystemEnv "git" (gitparams ++ [f]) (gitEnv repo)
#endif
where
gitparams = gitCommandLine