summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Driessen <me@nvie.com>2016-04-24 10:20:54 +0200
committerVincent Driessen <me@nvie.com>2016-04-24 10:20:54 +0200
commitb22a5e944b2f00dd8e9e6f0c8c690ef2d6204886 (patch)
treebf4ebe9538ec8676d1bb4513b445ca4417c1ca6d
parent9149c34a8b99052b4e92289c035a3c2d04fb8246 (diff)
downloadgitpython-b22a5e944b2f00dd8e9e6f0c8c690ef2d6204886.tar.gz
Allow "@" sign in fetch output lines
-rw-r--r--git/remote.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/git/remote.py b/git/remote.py
index 5a9094cd..e430abf5 100644
--- a/git/remote.py
+++ b/git/remote.py
@@ -185,8 +185,7 @@ class FetchInfo(object):
NEW_TAG, NEW_HEAD, HEAD_UPTODATE, TAG_UPDATE, REJECTED, FORCED_UPDATE, \
FAST_FORWARD, ERROR = [1 << x for x in range(8)]
- # %c %-*s %-*s -> %s (%s)
- re_fetch_result = re.compile("^\s*(.) (\[?[\w\s\.$]+\]?)\s+(.+) -> ([/\w_\+\.\-$#]+)( \(.*\)?$)?")
+ re_fetch_result = re.compile("^\s*(.) (\[?[\w\s\.$@]+\]?)\s+(.+) -> ([/\w_\+\.\-$@#]+)( \(.*\)?$)?")
_flag_map = {'!': ERROR,
'+': FORCED_UPDATE,