D14530.id35148.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D14530.id35148.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
	@@ -521,6 +521,16 @@
	}

	public function getRemoteURI() {
	+ // Determine which remote to examine; default to 'origin'
	+ $remote = 'origin';
	+ $branch = $this->getBranchName();
	+ if ($branch) {
	+ $path = $this->getPathToUpstream($branch);
	+ if ($path->isConnectedToRemote()) {
	+ $remote = $path->getRemoteRemoteName();
	+ }
	+ }
	+
	// "git ls-remote --get-url" is the appropriate plumbing to get the remote
	// URI. "git config remote.origin.url", on the other hand, may not be as
	// accurate (for example, it does not take into account possible URL
	@@ -528,9 +538,9 @@
	// the --get-url flag requires git 1.7.5.
	$version = $this->getGitVersion();
	if (version_compare($version, '1.7.5', '>=')) {
	- list($stdout) = $this->execxLocal('ls-remote --get-url origin');
	+ list($stdout) = $this->execxLocal('ls-remote --get-url %s', $remote);
	} else {
	- list($stdout) = $this->execxLocal('config remote.origin.url');
	+ list($stdout) = $this->execxLocal('config %s', "remote.$remote.url");
	}

	$uri = rtrim($stdout);