Fix the git plugin merge command, see #326
This commit is contained in:
parent
84cfda3538
commit
a62307250f
|
@ -80,8 +80,9 @@ class Git implements \PHPCI\Plugin
|
||||||
protected function runMergeAction($options)
|
protected function runMergeAction($options)
|
||||||
{
|
{
|
||||||
if (array_key_exists('branch', $options)) {
|
if (array_key_exists('branch', $options)) {
|
||||||
$cmd = 'git checkout %s && git merge ' . $this->build->getBranch();
|
$cmd = 'cd "%s" && git checkout %s && git merge "%s"';
|
||||||
return $this->phpci->executeCommand($cmd, $this->directory, $options['branch']);
|
$path = $this->phpci->buildPath;
|
||||||
|
return $this->phpci->executeCommand($cmd, $path, $options['branch'], $this->build->getBranch());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue