Skip to content

Commit 25844b8

Browse files
committed
Fix regex
This catches the case where the matched line contains "(" or ")" characters.
1 parent 2f91ab7 commit 25844b8

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

‎doc/source/changes.rst

+5
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
Changelog
33
=========
44

5+
2.0.5 - Fixes
6+
=============
7+
8+
* Fix: parser of fetch info lines choked on some legitimate lines
9+
510
2.0.4 - Fixes
611
=============
712

‎git/remote.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ class FetchInfo(object):
204204
NEW_TAG, NEW_HEAD, HEAD_UPTODATE, TAG_UPDATE, REJECTED, FORCED_UPDATE, \
205205
FAST_FORWARD, ERROR = [1 << x for x in range(8)]
206206

207-
re_fetch_result = re.compile("^\s*(.) (\[?[\w\s\.$@]+\]?)\s+(.+) -> ([/\w_\+\.\-$@#]+)( \(.*\)?$)?")
207+
re_fetch_result = re.compile("^\s*(.) (\[?[\w\s\.$@]+\]?)\s+(.+) -> ([/\w_\+\.\-$@#()]+)( \(.*\)?$)?")
208208

209209
_flag_map = {'!': ERROR,
210210
'+': FORCED_UPDATE,

0 commit comments

Comments
 (0)