Commit79fdaf3

committed

Merge pull request#456 from gitpython-developers/fix-for-invalid-data-in-commits

Add test case as example of Git commit with invalid data

2 parentsf5089d9 +79c99c0 commit79fdaf3Copy full SHA for 79fdaf3

File tree

+16

-3

lines changed

+16

-3

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -501,14 +501,14 @@ def _deserialize(self, stream):`
`501`	`501`
`502`	`502`	`try:`
`503`	`503`	`self.author,self.authored_date,self.author_tz_offset= \`
`504`		`-parse_actor_and_date(author_line.decode(self.encoding))`
	`504`	`+parse_actor_and_date(author_line.decode(self.encoding,errors='replace'))`
`505`	`505`	`exceptUnicodeDecodeError:`
`506`	`506`	`log.error("Failed to decode author line '%s' using encoding %s",author_line,self.encoding,`
`507`	`507`	`exc_info=True)`
`508`	`508`
`509`	`509`	`try:`
`510`	`510`	`self.committer,self.committed_date,self.committer_tz_offset= \`
`511`		`-parse_actor_and_date(committer_line.decode(self.encoding))`
	`511`	`+parse_actor_and_date(committer_line.decode(self.encoding,errors='replace'))`
`512`	`512`	`exceptUnicodeDecodeError:`
`513`	`513`	`log.error("Failed to decode committer line '%s' using encoding %s",committer_line,self.encoding,`
`514`	`514`	`exc_info=True)`
`@@ -518,7 +518,7 @@ def _deserialize(self, stream):`
`518`	`518`	`# The end of our message stream is marked with a newline that we strip`
`519`	`519`	`self.message=stream.read()`
`520`	`520`	`try:`
`521`		`-self.message=self.message.decode(self.encoding)`
	`521`	`+self.message=self.message.decode(self.encoding,errors='replace')`
`522`	`522`	`exceptUnicodeDecodeError:`
`523`	`523`	`log.error("Failed to decode message '%s' using encoding %s",self.message,self.encoding,exc_info=True)`
`524`	`524`	`# END exception handling`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,6 @@`
	`1`	`+tree 9f1a495d7d9692d24f5caedaa89f5c2c32d59368`
	`2`	`+parent 492ace2ffce0e426ebeb55e364e987bcf024dd3b`
	`3`	`+author E.Azer Ko�o�o�oculu <azer@kodfabrik.com> 1306710073 +0300`
	`4`	`+committer E.Azer Ko�o�o�oculu <azer@kodfabrik.com> 1306710073 +0300`
	`5`	`+`
	`6`	`+add environjs`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -306,6 +306,13 @@ def test_serialization_unicode_support(self):`
`306`	`306`	`# it appears`
`307`	`307`	`cmt.author.__repr__()`
`308`	`308`
	`309`	`+deftest_invalid_commit(self):`
	`310`	`+cmt=self.rorepo.commit()`
	`311`	`+cmt._deserialize(open(fixture_path('commit_invalid_data'),'rb'))`
	`312`	`+`
	`313`	`+assertcmt.author.name==u'E.Azer Ko�o�o�oculu',cmt.author.name`
	`314`	`+assertcmt.author.email=='azer@kodfabrik.com',cmt.author.email`
	`315`	`+`
`309`	`316`	`deftest_gpgsig(self):`
`310`	`317`	`cmt=self.rorepo.commit()`
`311`	`318`	`cmt._deserialize(open(fixture_path('commit_with_gpgsig'),'rb'))`

Comments

(0)