diff options
| author | Vincent Driessen <me@nvie.com> | 2016-04-15 08:32:45 +0200 |
|---|---|---|
| committer | Vincent Driessen <me@nvie.com> | 2016-04-19 21:46:16 +0200 |
| commit | 1445b59bb41c4b1a94b7cb0ec6864c98de63814b (patch) | |
| tree | a231962fc64fb5b255d87ecb409bfc1f48dfe8a5 /git/diff.py | |
| parent | 2090b5487e69688be61cfbb97c346c452ab45ba2 (diff) | |
| download | gitpython-1445b59bb41c4b1a94b7cb0ec6864c98de63814b.tar.gz | |
Fix order of regex parts
When both old/new mode and rename from/to lines are found, they will
appear in different order.
Diffstat (limited to 'git/diff.py')
| -rw-r--r-- | git/diff.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/git/diff.py b/git/diff.py index fd13f988..d4affd30 100644 --- a/git/diff.py +++ b/git/diff.py @@ -199,11 +199,11 @@ class Diff(object): re_header = re.compile(r""" ^diff[ ]--git [ ](?:a/)?(?P<a_path_fallback>.+?)[ ](?:b/)?(?P<b_path_fallback>.+?)\n + (?:^old[ ]mode[ ](?P<old_mode>\d+)\n + ^new[ ]mode[ ](?P<new_mode>\d+)(?:\n|$))? (?:^similarity[ ]index[ ]\d+%\n ^rename[ ]from[ ](?P<rename_from>.*)\n ^rename[ ]to[ ](?P<rename_to>.*)(?:\n|$))? - (?:^old[ ]mode[ ](?P<old_mode>\d+)\n - ^new[ ]mode[ ](?P<new_mode>\d+)(?:\n|$))? (?:^new[ ]file[ ]mode[ ](?P<new_file_mode>.+)(?:\n|$))? (?:^deleted[ ]file[ ]mode[ ](?P<deleted_file_mode>.+)(?:\n|$))? (?:^index[ ](?P<a_blob_id>[0-9A-Fa-f]+) @@ -331,8 +331,9 @@ class Diff(object): previous_header = None for header in cls.re_header.finditer(text): a_path_fallback, b_path_fallback, \ + old_mode, new_mode, \ rename_from, rename_to, \ - old_mode, new_mode, new_file_mode, deleted_file_mode, \ + new_file_mode, deleted_file_mode, \ a_blob_id, b_blob_id, b_mode, \ a_path, b_path = header.groups() new_file, deleted_file = bool(new_file_mode), bool(deleted_file_mode) |