Nemcio/GitList
1
0
Fork 0
mirror of https://github.com/klaussilveira/gitlist.git synced 2025-11-18 03:30:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Show diff of merge commits

Browse Source
This commit is contained in:
Jérôme Tamarelle
2012-07-21 11:24:30 +02:00
parent 688c04b163
commit 4b028e6296
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/GitList/Component/Git/Repository.php
View File

@@ -320,9 +320,9 @@ class Repository
return $commits;
}
public function getCommit($commit)
public function getCommit($commitHash)
{
$logs = $this->getClient()->run($this, 'show --pretty=format:\'{"hash": "%H", "short_hash": "%h", "tree": "%T", "parent": "%P", "author": "%an", "author_email": "%ae", "date": "%at", "commiter": "%cn", "commiter_email": "%ce", "commiter_date": "%ct", "message": "%f"}\' ' . $commit);
$logs = $this->getClient()->run($this, 'show --pretty=format:\'{"hash": "%H", "short_hash": "%h", "tree": "%T", "parent": "%P", "author": "%an", "author_email": "%ae", "date": "%at", "commiter": "%cn", "commiter_email": "%ce", "commiter_date": "%ct", "message": "%f"}\' ' . $commitHash);
if (empty($logs)) {
throw new \RuntimeException('No commit log available');
@@ -338,7 +338,7 @@ class Repository
unset($logs[0]);
if (empty($logs[1])) {
throw new \RuntimeException('No commit log available');
$logs = explode("\n", $this->getClient()->run($this, 'diff '.$commitHash.'~1..'.$commitHash));
}
// Read diff logs