deblan/phpci
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixing comparison where commit ID is Manual.

Browse source 
Fixes #823
This commit is contained in:
Dan Cryer 2015-02-25 14:13:28 +00:00
parent 18ff21174e
commit e423c73c4e
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
PHPCI/Model/Build/GithubBuild.php
View file

@ -209,7 +209,9 @@ class GithubBuild extends RemoteGitBuild
if (!empty($prNumber)) {
$builder->executeCommand('cd %s && git diff origin/%s "%s"', $path, $this->getBranch(), $file);
} else {
$builder->executeCommand('cd %s && git diff %s^! "%s"', $path, $this->getCommitId(), $file);
$commitId = $this->getCommitId();
$compare = $commitId == 'Manual' ? 'HEAD' : $commitId;
$builder->executeCommand('cd %s && git diff %s^! "%s"', $path, $compare, $file);
}
$builder->logExecOutput(true);