D18678.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D18678.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
	@@ -497,6 +497,10 @@
	return null;
	}

	+ if (!strlen($branch)) {
	+ return null;
	+ }
	+
	return $branch;
	}

	@@ -509,7 +513,7 @@
	// Verify this, and strip it.
	$ref = rtrim($stdout);
	$branch = $this->getBranchNameFromRef($ref);
	- if (!$branch) {
	+ if ($branch === null) {
	throw new Exception(
	pht('Failed to parse %s output!', 'git symbolic-ref'));
	}
	@@ -1015,7 +1019,7 @@
	list($ref, $hash, $epoch, $tree, $desc, $text) = $fields;

	$branch = $this->getBranchNameFromRef($ref);
	- if ($branch) {
	+ if ($branch !== null) {
	$result[] = array(
	'current' => ($branch === $current),
	'name' => $branch,
	diff --git a/src/workflow/ArcanistLandWorkflow.php b/src/workflow/ArcanistLandWorkflow.php
	--- a/src/workflow/ArcanistLandWorkflow.php
	+++ b/src/workflow/ArcanistLandWorkflow.php
	@@ -444,7 +444,7 @@
	$branch = $this->getArgument('branch');
	if (empty($branch)) {
	$branch = $this->getBranchOrBookmark();
	- if ($branch) {
	+ if ($branch !== null) {
	$this->branchType = $this->getBranchType($branch);

	// TODO: This message is misleading when landing a detached head or