summaryrefslogtreecommitdiff
path: root/git
diff options
context:
space:
mode:
Diffstat (limited to 'git')
-rw-r--r--git/repo/base.py2
-rw-r--r--git/test/test_repo.py5
2 files changed, 6 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"))
diff --git a/git/test/test_repo.py b/git/test/test_repo.py
index 3abd9cd0..046b20a7 100644
--- a/git/test/test_repo.py
+++ b/git/test/test_repo.py
@@ -365,6 +365,11 @@ class TestRepo(TestBase):
pass
# END for each config level
+ def test_config_level_paths(self):
+ for config_level in self.rorepo.config_level:
+ assert self.rorepo._get_config_path(config_level)
+ # end for each config level
+
def test_creation_deletion(self):
# just a very quick test to assure it generally works. There are
# specialized cases in the test_refs module