Masterwork_From_Distant_Lands
No One
Actions

Authored By

	epriestley
	Jul 9 2014, 9:19 PM

Size

1 KB

Referenced Files

None

Subscribers

None

Masterwork_From_Distant_Lands
View Options

	diff --git a/src/repository/api/ArcanistGitAPI.php b/src/repository/api/ArcanistGitAPI.php
	index d637fce..2cd73fb 100644
	--- a/src/repository/api/ArcanistGitAPI.php
	+++ b/src/repository/api/ArcanistGitAPI.php
	@@ -1167,8 +1167,11 @@ final class ArcanistGitAPI extends ArcanistRepositoryAPI {
	}
	break;
	case 'upstream':
	- list($err, $upstream) = $this->execManualLocal(
	+ list($err, $upstream, $stdout) = $this->execManualLocal(
	"rev-parse --abbrev-ref --symbolic-full-name '@{upstream}'");
	+ var_dump($err);
	+ var_dump($upstream);
	+ var_dump($stdout);
	if (!$err) {
	$upstream = rtrim($upstream);
	list($upstream_merge_base) = $this->execxLocal(
	@@ -1179,7 +1182,10 @@ final class ArcanistGitAPI extends ArcanistRepositoryAPI {
	"it is the merge-base of the upstream of the current branch ".
	"and HEAD, and matched the rule '{$rule}' in your {$source} ".
	"'base' configuration.");
	+ var_dump("MERGE BASE {$upstream_merge_base}");
	return $upstream_merge_base;
	+ } else {
	+ throw new Exception("UPSTREAM ERROR {$err}!!");
	}
	break;
	case 'this':