diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2015-01-04 13:48:29 +0100 |
|---|---|---|
| committer | Sebastian Thiel <byronimo@gmail.com> | 2015-01-04 13:48:29 +0100 |
| commit | c80d727e374321573bb00e23876a67c77ff466e3 (patch) | |
| tree | 7590d6ae544eac56e83639d27e1f9013b38d8a4b /git/diff.py | |
| parent | 965a08c3f9f2fbd62691d533425c699c943cb865 (diff) | |
| download | GitPython-c80d727e374321573bb00e23876a67c77ff466e3.tar.gz GitPython-c80d727e374321573bb00e23876a67c77ff466e3.zip | |
Bumped version, updated changelog, reduced code smell
There is more work to do though, as many imports are still incorrect.
Also, there are still print statements
Diffstat (limited to 'git/diff.py')
| -rw-r--r-- | git/diff.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/git/diff.py b/git/diff.py index 456974af..5325ad6b 100644 --- a/git/diff.py +++ b/git/diff.py @@ -7,7 +7,6 @@ import re from objects.blob import Blob from objects.util import mode_str_to_int -from exc import GitCommandError from gitdb.util import hex_to_bin @@ -106,7 +105,7 @@ class Diffable(object): diff_method = Diff._index_from_patch_format index = diff_method(self.repo, proc.stdout) - status = proc.wait() + proc.wait() return index @@ -321,7 +320,7 @@ class Diff(object): modify, delete and add files :return: git.DiffIndex""" # handles - # :100644 100644 6870991011cc8d9853a7a8a6f02061512c6a8190 37c5e30c879213e9ae83b21e9d11e55fc20c54b7 M .gitignore + # :100644 100644 687099101... 37c5e30c8... M .gitignore index = DiffIndex() for line in stream: if not line.startswith(":"): |