diff options
| author | Vincent Driessen <me@nvie.com> | 2016-06-14 07:51:25 +0200 |
|---|---|---|
| committer | Vincent Driessen <me@nvie.com> | 2016-06-14 21:49:31 +0200 |
| commit | 5e02afbb7343a7a4e07e3dcf8b845ea2764d927c (patch) | |
| tree | 9ccd689ccc2435bfe7b04057998065bfbc086c55 | |
| parent | 105a8c0fb3fe61b77956c8ebd3216738c78a3dff (diff) | |
| download | gitpython-5e02afbb7343a7a4e07e3dcf8b845ea2764d927c.tar.gz | |
Fix for parsing non-ASCII chars in status lines
| -rw-r--r-- | doc/source/changes.rst | 2 | ||||
| -rw-r--r-- | git/remote.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/doc/source/changes.rst b/doc/source/changes.rst index 3f5b8c50..9efbc0f0 100644 --- a/doc/source/changes.rst +++ b/doc/source/changes.rst @@ -5,6 +5,8 @@ Changelog 2.0.6 - Fixes and Features ========================== +* Fix: remote output parser now correctly matches refs with non-ASCII + chars in them * Fix: TypeError about passing keyword argument to string decode() on Python 2.6. * Feature: `setUrl API on Remotes <https://github.com/gitpython-developers/GitPython/pull/446#issuecomment-224670539>`_ diff --git a/git/remote.py b/git/remote.py index 75a6875f..9a26deeb 100644 --- a/git/remote.py +++ b/git/remote.py @@ -203,7 +203,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)] - re_fetch_result = re.compile("^\s*(.) (\[?[\w\s\.$@]+\]?)\s+(.+) -> ([/\w_\+\.\-$@#()]+)( \(.*\)?$)?") + re_fetch_result = re.compile('^\s*(.) (\[?[\w\s\.$@]+\]?)\s+(.+) -> ([^\s]+)( \(.*\)?$)?') _flag_map = {'!': ERROR, '+': FORCED_UPDATE, |