[#6078] gitpython-developers#102 Work-around mergetag blocks by ignoring them

Author: Cory Johns

git/objects/commit.py

@@ -426,11 +426,18 @@ def _deserialize(self, stream):
 		self.committer, self.committed_date, self.committer_tz_offset = parse_actor_and_date(readline())
 
 
+		# we might run into one or more mergetag blocks, skip those for now
+		next_line = readline()
+		while next_line.startswith('mergetag '):
+			next_line = readline()
+			while next_line.startswith(' '):
+				next_line = readline()
+		
 		# now we can have the encoding line, or an empty line followed by the optional
 		# message.
 		self.encoding = self.default_encoding
 		# read encoding or empty line to separate message
-		enc = readline()
+		enc = next_line
 		enc = enc.strip()
 		if enc:
 			self.encoding = enc[enc.find(' ')+1:]