D14365.id34685.diff
No OneTemporary
Actions

Size

856 B

Referenced Files

None

Subscribers

None

D14365.id34685.diff
View Options

	diff --git a/src/land/ArcanistGitLandEngine.php b/src/land/ArcanistGitLandEngine.php
	--- a/src/land/ArcanistGitLandEngine.php
	+++ b/src/land/ArcanistGitLandEngine.php
	@@ -148,8 +148,11 @@

	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 @@
	pht('PUSHING'),
	pht('Pushing changes to "%s".', $this->getTargetFullRef()));

	- list($err) = $api->execPassthru(
	+ $err = $api->execPassthru(
	'push -- %s %s:%s',
	$this->getTargetRemote(),
	$this->mergedRef,