D8761.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D8761.diff
View Options

	diff --git a/src/workflow/ArcanistBaseWorkflow.php b/src/workflow/ArcanistBaseWorkflow.php
	--- a/src/workflow/ArcanistBaseWorkflow.php
	+++ b/src/workflow/ArcanistBaseWorkflow.php
	@@ -62,6 +62,7 @@
	private $command;

	private $stashed;
	+ private $shouldAmend;

	private $projectInfo;
	private $repositoryInfo;
	@@ -913,7 +914,7 @@
	}

	if ($must_commit) {
	- if ($this->shouldAmend()) {
	+ if ($this->getShouldAmend()) {
	$commit = head($api->getLocalCommitInformation());
	$api->amendCommit($commit['message']);
	} else if ($api->supportsLocalCommits()) {
	@@ -926,8 +927,11 @@
	}
	}

	- private function shouldAmend() {
	- return $this->calculateShouldAmend();
	+ private function getShouldAmend() {
	+ if ($this->shouldAmend === null) {
	+ $this->shouldAmend = $this->calculateShouldAmend();
	+ }
	+ return $this->shouldAmend;
	}

	private function calculateShouldAmend() {
	@@ -1000,7 +1004,7 @@
	}

	private function getAskForAddPrompt(array $files) {
	- if ($this->shouldAmend()) {
	+ if ($this->getShouldAmend()) {
	$prompt = pht(
	'Do you want to amend these files to the commit?',
	count($files));