diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2018-01-09 15:36:56 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2018-01-09 16:22:07 -0400 |
| commit | aff377f1fd40d1d5dbfc44e9a3ca37e646c1dcd4 (patch) | |
| tree | ca6311b6565f217b1b037c7096d82c791cf010b9 /Git/Config.hs | |
| parent | 008fe331573e259960c268e4bd30eb0c851dafb7 (diff) | |
Improve startup time for commands that do not operate on remotes
And for tab completion, by not unnessessarily statting paths to remotes,
which used to cause eg, spin-up of removable drives.
Got rid of the remotes member of Git.Repo. This was a bit painful.
Remote.Git modifies the list of remotes as it reads their configs,
so still need a persistent list of remotes. So, put it in as
Annex.gitremotes. It's only populated by getGitRemotes, so commands
like examinekey that don't care about remotes won't do so.
This commit was sponsored by Jake Vosloo on Patreon.
Diffstat (limited to 'Git/Config.hs')
| -rw-r--r-- | Git/Config.hs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Git/Config.hs b/Git/Config.hs index 9b4c342a4..9cee83f2f 100644 --- a/Git/Config.hs +++ b/Git/Config.hs @@ -13,8 +13,8 @@ import Data.Char import Common import Git import Git.Types -import qualified Git.Construct import qualified Git.Command +import qualified Git.Construct import Utility.UserInfo {- Returns a single git config setting, or a default value if not set. -} @@ -89,12 +89,10 @@ hRead repo h = do store :: String -> Repo -> IO Repo store s repo = do let c = parse s - repo' <- updateLocation $ repo + updateLocation $ repo { config = (M.map Prelude.head c) `M.union` config repo , fullconfig = M.unionWith (++) c (fullconfig repo) } - rs <- Git.Construct.fromRemotes repo' - return $ repo' { remotes = rs } {- Updates the location of a repo, based on its configuration. - |