Consume merge tag (#231)

Author: adrian-lorenc

src/Gitonomy/Git/Parser/CommitParser.php

@@ -47,6 +47,8 @@ protected function doParse()
         list($this->committerName, $this->committerEmail, $committerDate) = $this->consumeNameEmailDate();
         $this->committerDate = $this->parseDate($committerDate);
 
+        $this->consumeMergeTag();
+
         // will consume an GPG signed commit if there is one
         $this->consumeGPGSignature();
 

src/Gitonomy/Git/Parser/LogParser.php

@@ -45,6 +45,8 @@ protected function doParse()
             list($commit['committerName'], $commit['committerEmail'], $committerDate) = $this->consumeNameEmailDate();
             $commit['committerDate'] = $this->parseDate($committerDate);
 
+            $this->consumeMergeTag();
+
             // will consume an GPG signed commit if there is one
             $this->consumeGPGSignature();
 

src/Gitonomy/Git/Parser/ParserBase.php

@@ -136,4 +136,18 @@ protected function consumeGPGSignature()
 
         return $this->consumeTo("\n\n");
     }
+
+    protected function consumeMergeTag()
+    {
+        $expected = "\nmergetag ";
+        $length = strlen($expected);
+        $actual = substr($this->content, $this->cursor, $length);
+        if ($actual != $expected) {
+            return '';
+        }
+        $this->cursor += $length;
+
+        $this->consumeTo('-----END PGP SIGNATURE-----');
+        $this->consume('-----END PGP SIGNATURE-----');
+    }
 }