summaryrefslogtreecommitdiff
path: root/git/config.py
diff options
context:
space:
mode:
Diffstat (limited to 'git/config.py')
-rw-r--r--git/config.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/git/config.py b/git/config.py
index 4de050a5..e686dcd3 100644
--- a/git/config.py
+++ b/git/config.py
@@ -446,7 +446,10 @@ class GitConfigParser(with_metaclass(MetaParserBuilder, cp.RawConfigParser, obje
raise e
def _has_includes(self):
- return self._merge_includes and self.has_section('include')
+ return self._merge_includes and any(
+ section == 'include' or section.startswith('includeIf ')
+ for section in self.sections()
+ )
def read(self):
"""Reads the data stored in the files we have been initialized with. It will