D7445.diff
All Users
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D7445.diff
View Options

	diff --git a/src/applications/diffusion/query/stablecommitname/DiffusionGitStableCommitNameQuery.php b/src/applications/diffusion/query/stablecommitname/DiffusionGitStableCommitNameQuery.php
	--- a/src/applications/diffusion/query/stablecommitname/DiffusionGitStableCommitNameQuery.php
	+++ b/src/applications/diffusion/query/stablecommitname/DiffusionGitStableCommitNameQuery.php
	@@ -6,9 +6,17 @@
	protected function executeQuery() {
	$repository = $this->getRepository();
	$branch = $this->getBranch();
	- list($stdout) = $repository->execxLocalCommand(
	- 'rev-parse --verify %s',
	- $branch);
	+
	+ if ($repository->isWorkingCopyBare()) {
	+ list($stdout) = $repository->execxLocalCommand(
	+ 'rev-parse --verify %s',
	+ $branch);
	+ } else {
	+ list($stdout) = $repository->execxLocalCommand(
	+ 'rev-parse --verify %s/%s',
	+ DiffusionBranchInformation::DEFAULT_GIT_REMOTE,
	+ $branch);
	+ }

	$commit = trim($stdout);
	return substr($commit, 0, 16);
	diff --git a/src/applications/diffusion/request/DiffusionGitRequest.php b/src/applications/diffusion/request/DiffusionGitRequest.php
	--- a/src/applications/diffusion/request/DiffusionGitRequest.php
	+++ b/src/applications/diffusion/request/DiffusionGitRequest.php
	@@ -31,7 +31,13 @@
	if ($this->commit) {
	return $this->commit;
	}
	- return $this->getBranch();
	+
	+ if ($this->repository->isWorkingCopyBare()) {
	+ return $this->getBranch();
	+ } else {
	+ $remote = DiffusionBranchInformation::DEFAULT_GIT_REMOTE;
	+ return $remote.'/'.$this->getBranch();
	+ }
	}

	}