D15342.id36998.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D15342.id36998.diff
View Options

	diff --git a/src/workflow/ArcanistAliasWorkflow.php b/src/workflow/ArcanistAliasWorkflow.php
	--- a/src/workflow/ArcanistAliasWorkflow.php
	+++ b/src/workflow/ArcanistAliasWorkflow.php
	@@ -59,17 +59,23 @@

	public static function getAliases(
	ArcanistConfigurationManager $configuration_manager) {
	+ $system_aliases = idx(
	+ $configuration_manager->readSystemArcConfig(),
	+ 'aliases',
	+ array());

	- $working_copy_config_aliases =
	+ $working_copy_aliases =
	$configuration_manager->getProjectConfig('aliases');
	- if (!$working_copy_config_aliases) {
	- $working_copy_config_aliases = array();
	+ if (!$working_copy_aliases) {
	+ $working_copy_aliases = array();
	}
	- $user_config_aliases = idx(
	+
	+ $user_aliases = idx(
	$configuration_manager->readUserConfigurationFile(),
	'aliases',
	array());
	- return $user_config_aliases + $working_copy_config_aliases;
	+
	+ return $user_aliases + $working_copy_aliases + $system_aliases;
	}

	private function writeAliases(array $aliases) {