revi-archive/phorge-arcanist
1
0
Fork 0
mirror of https://we.phorge.it/source/arcanist.git synced 2024-11-22 14:52:40 +01:00
Code Issues Releases Wiki Activity

Explicitly provide "--ff" when performing squash merges in "arc land" under Git

Browse source 
Summary: Ref T3855. See discussion leading up to T3855#142304.

Test Plan: See T3855#142304.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T3855

Differential Revision: https://secure.phabricator.com/D14365
This commit is contained in:
epriestley 2015-10-28 16:46:39 -07:00
parent c844669326
commit baf5eb8a87
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/land/ArcanistGitLandEngine.php
View file

@ -148,8 +148,11 @@ final class ArcanistGitLandEngine
try {
if ($this->getShouldSquash()) {
// NOTE: We're explicitly specifying "--ff" to override the presence
// of "merge.ff" options in user configuration.
$api->execxLocal(
'merge --no-stat --no-commit --squash -- %s',
'merge --no-stat --no-commit --ff --squash -- %s',
$source);
} else {
$api->execxLocal(
@ -200,7 +203,7 @@ final class ArcanistGitLandEngine
pht('PUSHING'),
pht('Pushing changes to "%s".', $this->getTargetFullRef()));
list($err) = $api->execPassthru(
$err = $api->execPassthru(
'push -- %s %s:%s',
$this->getTargetRemote(),
$this->mergedRef,