diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-06-10 19:20:14 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-06-10 19:20:14 -0400 |
| commit | 899f84a217681833146fadd8f30cd25ed1a9f653 (patch) | |
| tree | 37351958f69f8afef17b96966a30ca2dde79ba1c /Remote/Git.hs | |
| parent | 465c36e8f6a45b888e8f7be8baa52f0eb1759f77 (diff) | |
export CreateProcess fields from Utility.Process
update code to avoid cwd and env redefinition warnings
Diffstat (limited to 'Remote/Git.hs')
| -rw-r--r-- | Remote/Git.hs | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Remote/Git.hs b/Remote/Git.hs index da702730a..5dcd3bf15 100644 --- a/Remote/Git.hs +++ b/Remote/Git.hs @@ -55,7 +55,6 @@ import Creds import Control.Concurrent import Control.Concurrent.MSampleVar -import System.Process (std_in, std_err) import qualified Data.Map as M import Control.Exception.Extensible @@ -467,12 +466,12 @@ fsckOnRemote r params | otherwise = return $ do program <- readProgramFile r' <- Git.Config.read r - env <- getEnvironment - let env' = addEntries + environ <- getEnvironment + let environ' = addEntries [ ("GIT_WORK_TREE", Git.repoPath r') , ("GIT_DIR", Git.localGitDir r') - ] env - batchCommandEnv program (Param "fsck" : params) $ Just env' + ] environ + batchCommandEnv program (Param "fsck" : params) $ Just environ' {- The passed repair action is run in the Annex monad of the remote. -} repairRemote :: Git.Repo -> Annex Bool -> Annex (IO Bool) |