D18599.diff
No OneTemporary
Actions

Size

945 B

Referenced Files

None

Subscribers

None

D18599.diff
View Options

	diff --git a/src/applications/differential/controller/DifferentialRevisionOperationController.php b/src/applications/differential/controller/DifferentialRevisionOperationController.php
	--- a/src/applications/differential/controller/DifferentialRevisionOperationController.php
	+++ b/src/applications/differential/controller/DifferentialRevisionOperationController.php
	@@ -137,9 +137,19 @@
	return null;
	}

	- return $this->newRefQuery($repository)
	+ // NOTE: See PHI68. This is a workaround to make "Land Revision" work
	+ // until T11823 is fixed properly. If we find multiple refs with the same
	+ // name (normally, duplicate "master" refs), just pick the first one.
	+
	+ $refs = $this->newRefQuery($repository)
	->withRefNames(array($default_name))
	- ->executeOne();
	+ ->execute();
	+
	+ if ($refs) {
	+ return head($refs);
	+ }
	+
	+ return null;
	}

	private function getDefaultRefName(