summaryrefslogtreecommitdiff
path: root/git/remote.py
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2011-07-04 20:53:48 +0200
committerSebastian Thiel <byronimo@gmail.com>2011-07-04 22:09:56 +0200
commite94df6acd3e22ce0ec7f727076fd9046d96d57b2 (patch)
tree136aa7c6a4221d66733007011a43b39562763a09 /git/remote.py
parente9bd04844725661c8aa2aef11091f01eeab69486 (diff)
downloadgitpython-e94df6acd3e22ce0ec7f727076fd9046d96d57b2.tar.gz
Fixes #23
Diffstat (limited to 'git/remote.py')
-rw-r--r--git/remote.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/git/remote.py b/git/remote.py
index a3b91113..07019038 100644
--- a/git/remote.py
+++ b/git/remote.py
@@ -271,7 +271,9 @@ class FetchInfo(object):
ref_type = None
if remote_local_ref == "FETCH_HEAD":
ref_type = SymbolicReference
- elif ref_type_name == "branch":
+ elif ref_type_name in ("remote-tracking", "branch"):
+ # note: remote-tracking is just the first part of the 'remote-tracking branch' token.
+ # We don't parse it correctly, but its enough to know what to do, and its new in git 1.7something
ref_type = RemoteReference
elif ref_type_name == "tag":
ref_type = TagReference