Skip to content

Edge case: Empty message in the first commit #217

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lyrixx merged 2 commits into from
May 7, 2024
Merged

Edge case: Empty message in the first commit #217

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9175ec
Edge case: Empty message in the first commit (#217)
claudiu-cristea Feb 6, 2024
255e0ed
Ensure author identity
claudiu-cristea May 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
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.
  • Loading branch information
@claudiu-cristea
claudiu-cristea committed May 7, 2024
commit b9175ecb9a80e08242350b4ff8fa6e5e26dd3d23
4 changes: 3 additions & 1 deletion src/Gitonomy/Git/Parser/LogParser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(' ')) {
Expand Down
10 changes: 10 additions & 0 deletions tests/Gitonomy/Git/Tests/LogTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}