summaryrefslogtreecommitdiff
path: root/lib/git/repo.py
diff options
context:
space:
mode:
authorunknown <byron@.(none)>2010-07-02 19:34:26 +0200
committerSebastian Thiel <byronimo@gmail.com>2010-07-02 19:38:37 +0200
commita4287f65878000b42d11704692f9ea3734014b4c (patch)
tree75a52b5874e74422e977559af4b0fa32b3c429a1 /lib/git/repo.py
parentf683c6623f73252645bb2819673046c9d397c567 (diff)
downloadgitpython-a4287f65878000b42d11704692f9ea3734014b4c.tar.gz
win32 compatability adjustments
Diffstat (limited to 'lib/git/repo.py')
-rw-r--r--lib/git/repo.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/git/repo.py b/lib/git/repo.py
index d9b943cd..62202364 100644
--- a/lib/git/repo.py
+++ b/lib/git/repo.py
@@ -22,6 +22,7 @@ from gitdb.util import (
join,
isdir,
isfile,
+ join,
hex_to_bin
)
import os
@@ -285,9 +286,9 @@ class Repo(object):
if config_level == "system":
return "/etc/gitconfig"
elif config_level == "global":
- return os.path.expanduser("~/.gitconfig")
+ return os.path.normpath(os.path.expanduser("~/.gitconfig"))
elif config_level == "repository":
- return "%s/config" % self.git_dir
+ return join(self.git_dir, "config")
raise ValueError( "Invalid configuration level: %r" % config_level )