Edge case: Empty message in the first commit (#217)

Don't try to consume a 2nd new line when the first repository commit has an empty message.
gitonomy · May 7, 2024 · b9175ec · b9175ec
1 parent 5a47e03
commit b9175ec
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/Gitonomy/Git/Parser/LogParser.php b/src/Gitonomy/Git/Parser/LogParser.php
@@ -49,7 +49,9 @@ protected function doParse()
             $this->consumeGPGSignature();
 
             $this->consumeNewLine();
-            $this->consumeNewLine();
+            if ($this->cursor < strlen($this->content)) {
+                $this->consumeNewLine();
+            }
 
             $message = '';
             if ($this->expects('    ')) {

diff --git a/tests/Gitonomy/Git/Tests/LogTest.php b/tests/Gitonomy/Git/Tests/LogTest.php
@@ -76,4 +76,14 @@ public function testIterable($repository)
             }
         }
     }
+
+    public function testFirstMessageEmpty()
+    {
+        $repository = $this->createEmptyRepository(false);
+        file_put_contents($repository->getWorkingDir().'/file', 'foo');
+        $repository->run('add', ['.']);
+        $repository->run('commit', ['--allow-empty-message', '--no-edit']);
+        $commits = $repository->getLog()->getCommits();
+        $this->assertCount(1, $commits);
+    }
 }