D9616.diff
No OneTemporary
Actions

Size

851 B

Referenced Files

None

Subscribers

None

D9616.diff
View Options

	diff --git a/src/repository/api/ArcanistGitAPI.php b/src/repository/api/ArcanistGitAPI.php
	--- a/src/repository/api/ArcanistGitAPI.php
	+++ b/src/repository/api/ArcanistGitAPI.php
	@@ -600,11 +600,17 @@
	$futures = array(
	$uncommitted_future,
	$untracked_future,
	- $unstaged_future,
	+ // NOTE: `git diff-files` races with each of these other commands
	+ // internally, and resolves with inconsistent results if executed
	+ // in parallel. To work around this, DO NOT run it at the same time.
	+ // After the other commands exit, we can start the `diff-files` command.
	);

	Futures($futures)->resolveAll();

	+ // We're clear to start the `git diff-files` now.
	+ $unstaged_future->start();
	+
	$result = new PhutilArrayWithDefaultValue();

	list($stdout) = $uncommitted_future->resolvex();