D8729.id21923.diff
No OneTemporary
Actions

Size

878 B

Referenced Files

None

Subscribers

None

D8729.id21923.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
	@@ -191,7 +191,7 @@

	if ($this->useSquash) {
	$this->rebase();
	- $this->squash();
	+ $this->squash();
	} else {
	$this->merge();
	}
	@@ -936,6 +936,10 @@
	$repository_api->execxLocal(
	'commit -F %s',
	$this->messageFile);
	+ if (phutil_is_windows()) {
	+ // Occasionally on large repositories on Windows, Git can exit with an unclean working copy here. This prevents reverts from being pushed to the remote when this occurs.
	+ $this->requireCleanWorkingCopy();
	+ }
	} else if ($this->isHg) {
	// hg rebase produces a commit earlier as part of rebase
	if (!$this->useSquash) {