D8729.id20701.diff
No OneTemporary
Actions

Size

760 B

Referenced Files

None

Subscribers

None

D8729.id20701.diff
View Options

	diff --git a/src/workflow/ArcanistLandWorkflow.php b/src/workflow/ArcanistLandWorkflow.php
	--- a/src/workflow/ArcanistLandWorkflow.php
	+++ b/src/workflow/ArcanistLandWorkflow.php
	@@ -181,7 +181,7 @@

	if ($this->useSquash) {
	$this->rebase();
	- $this->squash();
	+ $this->squash();
	} else {
	$this->merge();
	}
	@@ -866,6 +866,8 @@
	$repository_api->execxLocal(
	'commit -F %s',
	$this->messageFile);
	+ //Check there are no unstaged changes warrning this will throw an epic error if the squash is broken
	+ $this->requireCleanWorkingCopy();
	} else if ($this->isHg) {
	// hg rebase produces a commit earlier as part of rebase
	if (!$this->useSquash) {