Skip to content

Fix GPG signed commits will break on reading full commit message #110

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
merged 1 commit into from
May 11, 2016
Merged

Fix GPG signed commits will break on reading full commit message #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions src/Gitonomy/Git/Parser/CommitParser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ protected function doParse()
$this->consume('committer ');
list($this->committerName, $this->committerEmail, $this->committerDate) = $this->consumeNameEmailDate();
$this->committerDate = $this->parseDate($this->committerDate);

// will consume an GPG signed commit if there is one
$this->consumeGPGSignature();

$this->consumeNewLine();

$this->consumeNewLine();
Expand Down
12 changes: 12 additions & 0 deletions tests/Gitonomy/Git/Tests/CommitTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,18 @@ public function testGetMessage($repository)
$this->assertEquals('add a long file'."\n", $commit->getMessage());
}

/**
* This test ensures that GPG signed commits does not break the reading of a commit
* message.
*
* @dataProvider provideFoobar
*/
public function testGetSignedMessage($repository)
{
$commit = $repository->getCommit(self::SIGNED_COMMIT);
$this->assertEquals('signed commit'."\n", $commit->getMessage());
}

/**
* @dataProvider provideFoobar
*/
Expand Down