summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlrik Laurén <ulrik.lauren@gmail.com>2020-04-28 01:09:57 +0200
committerUlrik Laurén <ulrik.lauren@gmail.com>2020-04-29 18:28:41 +0000
commitd0ca0f6814247d18d28e35de08ba193c4cf8e028 (patch)
tree39304ca4332f02fbaf5e069de82a191a3debb89b
parent433977e95812f0839796efdf4fae5863efe2025b (diff)
downloadgit-repo-d0ca0f6814247d18d28e35de08ba193c4cf8e028.tar.gz
Parse included files when reading git config files
Git config files may have an include tag pointing to another file. The included file is not parsed unless “git config --list” is explicitly told to follow includes by adding the argument ”--includes”. This change add the "--includes" when parsing the global gitconfig file. Change-Id: I892c9a3a748754c1eb8c9e220578305ca5850dd5 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/264759 Reviewed-by: Mike Frysinger <vapier@google.com> Tested-by: Ulrik Laurén <ulrik.lauren@gmail.com>
-rw-r--r--git_config.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/git_config.py b/git_config.py
index 8c4efac8..9af90dfd 100644
--- a/git_config.py
+++ b/git_config.py
@@ -362,7 +362,7 @@ class GitConfig(object):
362 return c 362 return c
363 363
364 def _do(self, *args): 364 def _do(self, *args):
365 command = ['config', '--file', self.file] 365 command = ['config', '--file', self.file, '--includes']
366 command.extend(args) 366 command.extend(args)
367 367
368 p = GitCommand(None, 368 p = GitCommand(None,