Skip to content

Commit

Permalink
Fix regression: Builds are not based upon existing build branches.
Browse files Browse the repository at this point in the history
  • Loading branch information
fago committed May 3, 2018
1 parent 902e5d5 commit f366537
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/Commands/BuildCommands.php
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,8 @@ public function buildBranch($branch, $options = ['clean' => TRUE]) {
);
// Create the build branch and merge in changes.
$task = $this->taskGitStack()
->exec("checkout -b $buildBranch")
->exec("branch $buildBranch $ancestorBranch")
->checkout($buildBranch)
->exec("merge $branchEscaped --no-edit");
$collection->addTask($task);
}
Expand Down

0 comments on commit f366537

Please sign in to comment.