diff options
| author | Daniele Esposti <daniele.esposti@gmail.com> | 2016-10-06 18:55:42 +0100 |
|---|---|---|
| committer | Daniele Esposti <daniele.esposti@gmail.com> | 2016-10-06 18:55:42 +0100 |
| commit | 26f9b9f40144b73d75e739ef5e6552007b6376f8 (patch) | |
| tree | 957cc9dbcafad0e7887df835bb5f85eadeb67288 /git/objects/commit.py | |
| parent | f0fcc072b37d6e773e18ea561ebce8ccba2ba19c (diff) | |
| parent | 833ac6ec4c9f185fd40af7852b6878326f44a0b3 (diff) | |
| download | gitpython-26f9b9f40144b73d75e739ef5e6552007b6376f8.tar.gz | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
git/util.py
Diffstat (limited to 'git/objects/commit.py')
| -rw-r--r-- | git/objects/commit.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git/objects/commit.py b/git/objects/commit.py index 000ab3d0..1534c552 100644 --- a/git/objects/commit.py +++ b/git/objects/commit.py @@ -140,7 +140,7 @@ class Commit(base.Object, Iterable, Diffable, Traversable, Serializable): def _set_cache_(self, attr): if attr in Commit.__slots__: # read the data in a chunk, its faster - then provide a file wrapper - binsha, typename, self.size, stream = self.repo.odb.stream(self.binsha) + binsha, typename, self.size, stream = self.repo.odb.stream(self.binsha) # @UnusedVariable self._deserialize(BytesIO(stream.read())) else: super(Commit, self)._set_cache_(attr) @@ -267,7 +267,7 @@ class Commit(base.Object, Iterable, Diffable, Traversable, Serializable): hexsha = line.strip() if len(hexsha) > 40: # split additional information, as returned by bisect for instance - hexsha, rest = line.split(None, 1) + hexsha, _ = line.split(None, 1) # END handle extra info assert len(hexsha) == 40, "Invalid line: %s" % hexsha |