diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2014-11-19 12:16:54 +0100 |
|---|---|---|
| committer | Sebastian Thiel <byronimo@gmail.com> | 2014-11-19 12:16:54 +0100 |
| commit | 1234a1077f24ca0e2f1a9b4d27731482a7ed752b (patch) | |
| tree | 755ccbe76bc225ef237264e1b45bcb17202087ec /git/diff.py | |
| parent | 4d9b7b09a7c66e19a608d76282eacc769e349150 (diff) | |
| parent | 257264743154b975bc156f425217593be14727a9 (diff) | |
| download | gitpython-1234a1077f24ca0e2f1a9b4d27731482a7ed752b.tar.gz | |
Merge branch 'autopep' into 0.3
Resolves https://github.com/gitpython-developers/GitPython/pull/182
Diffstat (limited to 'git/diff.py')
| -rw-r--r-- | git/diff.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git/diff.py b/git/diff.py index d8424e71..456974af 100644 --- a/git/diff.py +++ b/git/diff.py @@ -308,8 +308,8 @@ class Diff(object): new_file, deleted_file = bool(new_file_mode), bool(deleted_file_mode) index.append(Diff(repo, a_path, b_path, a_blob_id, b_blob_id, - old_mode or deleted_file_mode, new_mode or new_file_mode or b_mode, - new_file, deleted_file, rename_from, rename_to, diff[header.end():])) + old_mode or deleted_file_mode, new_mode or new_file_mode or b_mode, + new_file, deleted_file, rename_from, rename_to, diff[header.end():])) return index |