diff --git a/src/applications/diffusion/request/DiffusionGitRequest.php b/src/applications/diffusion/request/DiffusionGitRequest.php index df3df74c72..2f411c6584 100644 --- a/src/applications/diffusion/request/DiffusionGitRequest.php +++ b/src/applications/diffusion/request/DiffusionGitRequest.php @@ -32,11 +32,15 @@ final class DiffusionGitRequest extends DiffusionRequest { return $this->commit; } + return $this->getResolvableBranchName($this->getBranch()); + } + + protected function getResolvableBranchName($branch) { if ($this->repository->isWorkingCopyBare()) { - return $this->getBranch(); + return $branch; } else { $remote = DiffusionBranchInformation::DEFAULT_GIT_REMOTE; - return $remote.'/'.$this->getBranch(); + return $remote.'/'.$branch; } } diff --git a/src/applications/diffusion/request/DiffusionRequest.php b/src/applications/diffusion/request/DiffusionRequest.php index 9640df0a2f..928cc15422 100644 --- a/src/applications/diffusion/request/DiffusionRequest.php +++ b/src/applications/diffusion/request/DiffusionRequest.php @@ -643,7 +643,7 @@ abstract class DiffusionRequest { } if ($this->getSupportsBranches()) { - $branch = $this->getBranch(); + $branch = $this->getResolvableBranchName($this->getBranch()); } else { $branch = 'HEAD'; } @@ -660,6 +660,10 @@ abstract class DiffusionRequest { return $this->stableCommitName; } + protected function getResolvableBranchName($branch) { + return $branch; + } + private function resolveRefs(array $refs) { if ($this->shouldInitFromConduit()) { return DiffusionQuery::callConduitWithDiffusionRequest(