summaryrefslogtreecommitdiff
path: root/Git/Config.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-05-19 10:22:43 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-05-19 10:22:43 -0400
commit0093a456e869b5250735ef4ec790faac115d9142 (patch)
treeb56fd7643fa54935c45e9f6f4f3fa861177b3c0a /Git/Config.hs
parenta1885bd11607d8668d70f81eaafa25e5341e8e8c (diff)
test suite saved my bacon
git config reading memoization shouldn't be used when changing config
Diffstat (limited to 'Git/Config.hs')
-rw-r--r--Git/Config.hs31
1 files changed, 20 insertions, 11 deletions
diff --git a/Git/Config.hs b/Git/Config.hs
index 2fa685a11..38e1ca4be 100644
--- a/Git/Config.hs
+++ b/Git/Config.hs
@@ -28,19 +28,28 @@ getMaybe :: String -> Repo -> Maybe String
getMaybe key repo = M.lookup key (config repo)
{- Runs git config and populates a repo with its config.
- - Cannot use pipeRead because it relies on the config having been already
+ - Avoids re-reading config when run repeatedly. -}
+read :: Repo -> IO Repo
+read repo@(Repo { config = c })
+ | c == M.empty = read' repo
+ | otherwise = return repo
+
+{- Reads config even if it was read before. -}
+reRead :: Repo -> IO Repo
+reRead = read'
+
+{- Cannot use pipeRead because it relies on the config having been already
- read. Instead, chdir to the repo.
-}
-read :: Repo -> IO Repo
-read repo@(Repo { location = Local { gitdir = d } }) = read' repo d
-read repo@(Repo { location = LocalUnknown d }) = read' repo d
-read r = assertLocal r $ error "internal"
-read' :: Repo -> FilePath -> IO Repo
-read' repo@(Repo { config = c}) d
- | c == M.empty = bracketCd d $
- pOpen ReadFromPipe "git" ["config", "--null", "--list"] $
- hRead repo
- | otherwise = return repo -- config already read
+read' :: Repo -> IO Repo
+read' repo = go repo
+ where
+ go Repo { location = Local { gitdir = d } } = git_config d
+ go Repo { location = LocalUnknown d } = git_config d
+ go _ = assertLocal repo $ error "internal"
+ git_config d = bracketCd d $
+ pOpen ReadFromPipe "git" ["config", "--null", "--list"] $
+ hRead repo
{- Reads git config from a handle and populates a repo with it. -}
hRead :: Repo -> Handle -> IO Repo