summaryrefslogtreecommitdiff
path: root/lib/git/remote.py
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2010-07-13 22:22:31 +0200
committerSebastian Thiel <byronimo@gmail.com>2010-07-15 11:47:12 +0200
commit33819a21f419453bc2b4ca45b640b9a59361ed2b (patch)
treeb9d68a13f210af582ea5d432bb51da936452b09c /lib/git/remote.py
parent17a172920fde8c6688c8a1a39f258629b8b73757 (diff)
downloadgitpython-33819a21f419453bc2b4ca45b640b9a59361ed2b.tar.gz
Addiitonal win32 fixes related to, guess it, backslashes in paths
Diffstat (limited to 'lib/git/remote.py')
-rw-r--r--lib/git/remote.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/git/remote.py b/lib/git/remote.py
index 8442e809..8c75b1db 100644
--- a/lib/git/remote.py
+++ b/lib/git/remote.py
@@ -21,9 +21,9 @@ from refs import (
TagReference
)
-from gitdb.util import (
- join,
- )
+from git.util import join_path
+from gitdb.util import join
+
import re
import os
@@ -366,7 +366,7 @@ class FetchInfo(object):
if ref_type is SymbolicReference:
remote_local_ref = ref_type(repo, "FETCH_HEAD")
else:
- remote_local_ref = Reference.from_path(repo, join(ref_type._common_path_default, remote_local_ref.strip()))
+ remote_local_ref = Reference.from_path(repo, join_path(ref_type._common_path_default, remote_local_ref.strip()))
# END create ref instance
note = ( note and note.strip() ) or ''