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

Fix the git plugin merge command, see #326

Browse source
This commit is contained in:
Dan Cryer 2014-05-12 18:57:55 +01:00
parent 84cfda3538
commit a62307250f
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
PHPCI/Plugin/Git.php
View file

@ -80,8 +80,9 @@ class Git implements \PHPCI\Plugin
protected function runMergeAction($options)
{
if (array_key_exists('branch', $options)) {
$cmd = 'git checkout %s && git merge ' . $this->build->getBranch();
return $this->phpci->executeCommand($cmd, $this->directory, $options['branch']);
$cmd = 'cd "%s" && git checkout %s && git merge "%s"';
$path = $this->phpci->buildPath;
return $this->phpci->executeCommand($cmd, $path, $options['branch'], $this->build->getBranch());
}
}