From b22a5e944b2f00dd8e9e6f0c8c690ef2d6204886 Mon Sep 17 00:00:00 2001 From: Vincent Driessen Date: Sun, 24 Apr 2016 10:20:54 +0200 Subject: Allow "@" sign in fetch output lines --- git/remote.py | 3 +-- 1 file changed, 1 insertion(+), 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, -- cgit v1.2.1