c78b9b55b6
It's important that it be clear that it overrides a config, such that reloading the git config won't change it, and in particular, setConfig won't change it. Most of the calls to changeGitConfig were actually after setConfig, which was redundant and unncessary. So removed those. The only remaining one, besides --debug, is in the handling of repository-global config values. That one's ok, because the way mergeGitConfig is implemented, it does not override any value that is set in git config. If a value with a repo-global setting was passed to setConfig, it would set it in the git config, reload the git config, re-apply mergeGitConfig, and use the newly set value, which is the right thing.
40 lines
1.2 KiB
Haskell
40 lines
1.2 KiB
Haskell
{- git-annex configuration
|
|
-
|
|
- Copyright 2017-2019 Joey Hess <id@joeyh.name>
|
|
-
|
|
- Licensed under the GNU AGPL version 3 or higher.
|
|
-}
|
|
|
|
module Config.GitConfig where
|
|
|
|
import Annex.Common
|
|
import qualified Annex
|
|
import Types.GitConfig
|
|
import Git.Types
|
|
import Logs.Config
|
|
|
|
{- Gets a specific setting from GitConfig. If necessary, loads the
|
|
- repository-global defaults when the GitConfig does not yet
|
|
- have a value.
|
|
-
|
|
- Note: Be sure to add the config value to mergeGitConfig.
|
|
-}
|
|
getGitConfigVal :: (GitConfig -> Configurable a) -> Annex a
|
|
getGitConfigVal f = getGitConfigVal' f >>= \case
|
|
HasGlobalConfig c -> return c
|
|
DefaultConfig d -> return d
|
|
HasGitConfig c -> return c
|
|
|
|
getGitConfigVal' :: (GitConfig -> Configurable a) -> Annex (Configurable a)
|
|
getGitConfigVal' f = (f <$> Annex.getGitConfig) >>= \case
|
|
DefaultConfig _ -> do
|
|
r <- Annex.gitRepo
|
|
m <- loadGlobalConfig
|
|
let globalgc = extractGitConfig FromGlobalConfig (r { config = m })
|
|
-- This merge of the repo-global config and the git
|
|
-- config makes all repository-global default
|
|
-- values populate the GitConfig with HasGlobalConfig
|
|
-- values, so it will only need to be done once.
|
|
Annex.overrideGitConfig (\gc -> mergeGitConfig gc globalgc)
|
|
f <$> Annex.getGitConfig
|
|
c -> return c
|