fix decoding problem

ishepard · Byron · commit 3d7eaf125324 · 2019-09-16T10:49:16.000+02:00
diff --git a/git/objects/commit.py b/git/objects/commit.py
@@ -484,7 +484,8 @@ def _deserialize(self, stream):
 buf = enc.strip()
 while buf:
 if buf[0:10] == b"encoding ":
- self.encoding = buf[buf.find(' ') + 1:].decode('ascii')
+ self.encoding = buf[buf.find(' ') + 1:].decode(
+ self.encoding, 'ignore')
 elif buf[0:7] == b"gpgsig ":
 sig = buf[buf.find(b' ') + 1:] + b"\n"
 is_next_header = False
@@ -498,7 +499,7 @@ def _deserialize(self, stream):
 break
 sig += sigbuf[1:]
 # end read all signature
- self.gpgsig = sig.rstrip(b"\n").decode('ascii')
+ self.gpgsig = sig.rstrip(b"\n").decode(self.encoding, 'ignore')
 if is_next_header:
 continue
 buf = readline().strip()

-Original file line number
+Diff line change
 buf=enc.strip()
 whilebuf:
 ifbuf[0:10] ==b"encoding ":
 -self.encoding=buf[buf.find(' ') +1:].decode('ascii')
 +self.encoding=buf[buf.find(' ') +1:].decode(
 +self.encoding, 'ignore')
 elifbuf[0:7] ==b"gpgsig ":
 sig=buf[buf.find(b' ') +1:] +b"\n"
 is_next_header=False
 break
 sig+=sigbuf[1:]
 # end read all signature
 -self.gpgsig=sig.rstrip(b"\n").decode('ascii')
 +self.gpgsig=sig.rstrip(b"\n").decode(self.encoding, 'ignore')
 ifis_next_header:
 continue
 buf=readline().strip()