summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2015-07-06 15:48:31 +0200
committerSebastian Thiel <byronimo@gmail.com>2015-07-06 15:48:31 +0200
commitc5e4334f38dce4cf02db5f11a6e5844f3a7c785c (patch)
treeddbafac91d8155082100c77e424aff9a94ba6fc0
parentbbf04348b0c79be2103fd3aaa746685578eb12fd (diff)
parent1578baf817c2526d29276067d2f23d28b6fab2b1 (diff)
downloadgitpython-c5e4334f38dce4cf02db5f11a6e5844f3a7c785c.tar.gz
Merge pull request #309 from mihyaeru21/master
care tilde in include.path config
-rw-r--r--git/config.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/git/config.py b/git/config.py
index 2d9adbdd..b7ddf0d2 100644
--- a/git/config.py
+++ b/git/config.py
@@ -386,6 +386,8 @@ class GitConfigParser(with_metaclass(MetaParserBuilder, cp.RawConfigParser, obje
# We expect all paths to be normalized and absolute (and will assure that is the case)
if self._has_includes():
for _, include_path in self.items('include'):
+ if include_path.startswith('~'):
+ include_path = os.path.expanduser(include_path)
if not os.path.isabs(include_path):
if not close_fp:
continue