diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2017-12-11 11:47:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-11 11:47:40 +0100 |
| commit | a14277eecf65ac216dd1b756acee8c23ecdf95d9 (patch) | |
| tree | 174b504a43cf8b9e88165c1effd3ca9b28945d32 /git/diff.py | |
| parent | 0a96030d82fa379d24b952a58eed395143950c7b (diff) | |
| parent | f48d08760552448a196fa400725cde7198e9c9b9 (diff) | |
| download | gitpython-a14277eecf65ac216dd1b756acee8c23ecdf95d9.tar.gz | |
Merge pull request #702 from yarikoptic/bf-happy-travis
BF (codename "happy travis"): trying to address lints etc to make Travis green again
Diffstat (limited to 'git/diff.py')
| -rw-r--r-- | git/diff.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/git/diff.py b/git/diff.py index 16c782f3..28c10e49 100644 --- a/git/diff.py +++ b/git/diff.py @@ -313,20 +313,20 @@ class Diff(object): h %= self.b_blob.path msg = '' - l = None # temp line - ll = 0 # line length + line = None # temp line + line_length = 0 # line length for b, n in zip((self.a_blob, self.b_blob), ('lhs', 'rhs')): if b: - l = "\n%s: %o | %s" % (n, b.mode, b.hexsha) + line = "\n%s: %o | %s" % (n, b.mode, b.hexsha) else: - l = "\n%s: None" % n + line = "\n%s: None" % n # END if blob is not None - ll = max(len(l), ll) - msg += l + line_length = max(len(line), line_length) + msg += line # END for each blob # add headline - h += '\n' + '=' * ll + h += '\n' + '=' * line_length if self.deleted_file: msg += '\nfile deleted in rhs' |