diff options
author | Vincent Driessen <me@nvie.com> | 2016-05-30 16:38:43 +0200 |
---|---|---|
committer | Vincent Driessen <me@nvie.com> | 2016-05-30 16:38:43 +0200 |
commit | f15d3a553db0150824bc6c0c67467735ec739cb8 (patch) | |
tree | f98ac23b1476a1771cfb9ecaf6a187d879a4ee67 /git/objects/commit.py | |
parent | 1faf84f8eb760b003ad2be81432443bf443b82e6 (diff) | |
parent | 79c99c0f66c8f3c8d13258376c82125a23b1b5c8 (diff) | |
download | gitpython-patches.tar.gz |
Merge branch 'fix-for-invalid-data-in-commits' into patchespatches
Diffstat (limited to 'git/objects/commit.py')
-rw-r--r-- | git/objects/commit.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git/objects/commit.py b/git/objects/commit.py index dc722f97..58a8912f 100644 --- a/git/objects/commit.py +++ b/git/objects/commit.py @@ -501,14 +501,14 @@ class Commit(base.Object, Iterable, Diffable, Traversable, Serializable): try: self.author, self.authored_date, self.author_tz_offset = \ - parse_actor_and_date(author_line.decode(self.encoding)) + parse_actor_and_date(author_line.decode(self.encoding, errors='replace')) except UnicodeDecodeError: log.error("Failed to decode author line '%s' using encoding %s", author_line, self.encoding, exc_info=True) try: self.committer, self.committed_date, self.committer_tz_offset = \ - parse_actor_and_date(committer_line.decode(self.encoding)) + parse_actor_and_date(committer_line.decode(self.encoding, errors='replace')) except UnicodeDecodeError: log.error("Failed to decode committer line '%s' using encoding %s", committer_line, self.encoding, exc_info=True) @@ -518,7 +518,7 @@ class Commit(base.Object, Iterable, Diffable, Traversable, Serializable): # The end of our message stream is marked with a newline that we strip self.message = stream.read() try: - self.message = self.message.decode(self.encoding) + self.message = self.message.decode(self.encoding, errors='replace') except UnicodeDecodeError: log.error("Failed to decode message '%s' using encoding %s", self.message, self.encoding, exc_info=True) # END exception handling |