diff options
| author | JJ Graham <jgraham@indeed.com> | 2019-10-18 10:32:30 -0500 |
|---|---|---|
| committer | Sebastian Thiel <sebastian.thiel@icloud.com> | 2019-10-19 13:17:16 +0200 |
| commit | 4744efbb68c562adf7b42fc33381d27a463ae07a (patch) | |
| tree | 23a544eb01baccc9e96dd28e66f1bd2e7675587b /git/diff.py | |
| parent | a3c3efd20c50b2a9db98a892b803eb285b2a4f83 (diff) | |
| download | gitpython-4744efbb68c562adf7b42fc33381d27a463ae07a.tar.gz | |
Updating variable name to more accurately reflect contents
Diffstat (limited to 'git/diff.py')
| -rw-r--r-- | git/diff.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git/diff.py b/git/diff.py index 8bb0f839..80e0be6a 100644 --- a/git/diff.py +++ b/git/diff.py @@ -247,7 +247,7 @@ class Diff(object): (?:^deleted[ ]file[ ]mode[ ](?P<deleted_file_mode>.+)(?:\n|$))? (?:^similarity[ ]index[ ]\d+%\n ^copy[ ]from[ ].*\n - ^copy[ ]to[ ](?P<copied_file_mode>.*)(?:\n|$))? + ^copy[ ]to[ ](?P<copied_file_name>.*)(?:\n|$))? (?:^index[ ](?P<a_blob_id>[0-9A-Fa-f]+) \.\.(?P<b_blob_id>[0-9A-Fa-f]+)[ ]?(?P<b_mode>.+)?(?:\n|$))? (?:^---[ ](?P<a_path>[^\t\n\r\f\v]*)[\t\r\f\v]*(?:\n|$))? @@ -427,12 +427,12 @@ class Diff(object): a_path_fallback, b_path_fallback, \ old_mode, new_mode, \ rename_from, rename_to, \ - new_file_mode, deleted_file_mode, copied_file_mode, \ + new_file_mode, deleted_file_mode, copied_file_name, \ a_blob_id, b_blob_id, b_mode, \ a_path, b_path = header.groups() new_file, deleted_file, copied_file = \ - bool(new_file_mode), bool(deleted_file_mode), bool(copied_file_mode) + bool(new_file_mode), bool(deleted_file_mode), bool(copied_file_name) a_path = cls._pick_best_path(a_path, rename_from, a_path_fallback) b_path = cls._pick_best_path(b_path, rename_to, b_path_fallback) |