summaryrefslogtreecommitdiff
path: root/Git/Config.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-08-24 20:50:39 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-08-24 20:50:39 -0400
commitc9b3b8829dc3f106583fb933808179ec02773790 (patch)
treed2b27b5d8ee40c74be33c83807761c5eb5cea584 /Git/Config.hs
parent8de7699f3905f5a3feb88cd6297f982f3666a201 (diff)
thread safe git-annex index file use
Diffstat (limited to 'Git/Config.hs')
-rw-r--r--Git/Config.hs7
1 files changed, 5 insertions, 2 deletions
diff --git a/Git/Config.hs b/Git/Config.hs
index 0a720c1c0..fb0c24bab 100644
--- a/Git/Config.hs
+++ b/Git/Config.hs
@@ -9,7 +9,7 @@ module Git.Config where
import qualified Data.Map as M
import Data.Char
-import System.Process (cwd)
+import System.Process (cwd, env)
import Common
import Git
@@ -52,7 +52,10 @@ read' repo = go repo
hRead repo
where
params = ["config", "--null", "--list"]
- p = (proc "git" params) { cwd = Just d }
+ p = (proc "git" params)
+ { cwd = Just d
+ , env = gitEnv repo
+ }
{- Gets the global git config, returning a dummy Repo containing it. -}
global :: IO Repo