diff --git a/src/repository/api/ArcanistGitAPI.php b/src/repository/api/ArcanistGitAPI.php index a316093e..d1406096 100644 --- a/src/repository/api/ArcanistGitAPI.php +++ b/src/repository/api/ArcanistGitAPI.php @@ -497,6 +497,10 @@ final class ArcanistGitAPI extends ArcanistRepositoryAPI { return null; } + if (!strlen($branch)) { + return null; + } + return $branch; } @@ -509,7 +513,7 @@ final class ArcanistGitAPI extends ArcanistRepositoryAPI { // 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 @@ final class ArcanistGitAPI extends ArcanistRepositoryAPI { 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 index 5f13683a..b3c2b181 100644 --- a/src/workflow/ArcanistLandWorkflow.php +++ b/src/workflow/ArcanistLandWorkflow.php @@ -444,7 +444,7 @@ EOTEXT $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