From baf5eb8a8795f8c2e11e041357b2be4d04d69490 Mon Sep 17 00:00:00 2001 From: epriestley Date: Wed, 28 Oct 2015 16:46:39 -0700 Subject: [PATCH] Explicitly provide "--ff" when performing squash merges in "arc land" under Git 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 --- src/land/ArcanistGitLandEngine.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/land/ArcanistGitLandEngine.php b/src/land/ArcanistGitLandEngine.php index f2b5d632..95b33aa1 100644 --- a/src/land/ArcanistGitLandEngine.php +++ b/src/land/ArcanistGitLandEngine.php @@ -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,