Skip to content

Fix for parsing non-ASCII chars in status lines #473

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 7 commits into from
Closed

Fix for parsing non-ASCII chars in status lines #473

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5e02afb
Fix for parsing non-ASCII chars in status lines
nvie Jun 14, 2016
3ee291c
Store raw path bytes in Diff instances
nvie Jun 14, 2016
dc2ec79
Fix issue #470
warsaw Jun 15, 2016
930d03f
Merge pull request #475 from warsaw/issue470
Byron Jun 20, 2016
e9405ac
Merge pull request #474 from gitpython-developers/keep-raw-bytes-on-d…
Byron Jun 20, 2016
07a8f73
Merge branch 'master' into fix-non-ascii-chars-in-status-lines
Byron Jun 20, 2016
f128ae9
Merge branch 'master' into fix-non-ascii-chars-in-status-lines
Byron Jun 20, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Fix for parsing non-ASCII chars in status lines
  • Loading branch information
@nvie
nvie committed Jun 14, 2016
commit 5e02afbb7343a7a4e07e3dcf8b845ea2764d927c
2 changes: 2 additions & 0 deletions doc/source/changes.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>`_
Expand Down
2 changes: 1 addition & 1 deletion git/remote.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down