summaryrefslogtreecommitdiff
path: root/git/repo/base.py
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2015-01-12 10:25:10 +0100
committerSebastian Thiel <byronimo@gmail.com>2015-01-12 10:25:15 +0100
commitdfb0a9c4bca590efaa86f8edc3fdb62bd536bce7 (patch)
tree442e289ab6202de3434f566e84fd4a09753ed5b2 /git/repo/base.py
parentacd82464a11f3c2d3edc1d152d028a142da31a9f (diff)
downloadgitpython-dfb0a9c4bca590efaa86f8edc3fdb62bd536bce7.tar.gz
Added specific test for roughly checking configuration paths.
For some reason, I didn't trust the existing one as it tests that code more indirectly. Related to #160
Diffstat (limited to 'git/repo/base.py')
-rw-r--r--git/repo/base.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/git/repo/base.py b/git/repo/base.py
index 5a93a5a2..d6e55553 100644
--- a/git/repo/base.py
+++ b/git/repo/base.py
@@ -354,7 +354,7 @@ class Repo(object):
if config_level == "system":
return "/etc/gitconfig"
elif config_level == "user":
- config_home = os.environ.get("XDG_CONFIG_HOME") or join(os.environ.get("HOME", '~'), ".config")
+ config_home = os.environ.get("XDG_CONFIG_HOME") or os.path.join(os.environ.get("HOME", '~'), ".config")
return os.path.expanduser(join(config_home, "git", "config"))
elif config_level == "global":
return os.path.normpath(os.path.expanduser("~/.gitconfig"))