public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Merge branch '1.4'

pull/6356/head
Jordi Boggiano 2017-04-14 00:25:18 +02:00
parent a2e22f7a84 b6778cd7f6
commit b3b081234a
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Composer/Repository/Vcs/BitbucketDriver.php
View File

@ -321,13 +321,13 @@ abstract class BitbucketDriver extends VcsDriver
); );
$hasNext = true; $hasNext = true;
while ($hasNext) { while ($hasNext) {
// skip headless branches which seem to be deleted branches that bitbucket nevertheless returns in the API
if ($this->vcsType === 'hg' && empty($data['heads'])) {
continue;
}
$branchData = JsonFile::parseJson($this->getContentsWithOAuthCredentials($resource), $resource); $branchData = JsonFile::parseJson($this->getContentsWithOAuthCredentials($resource), $resource);
foreach ($branchData['values'] as $data) { foreach ($branchData['values'] as $data) {
// skip headless branches which seem to be deleted branches that bitbucket nevertheless returns in the API
if ($this->vcsType === 'hg' && empty($data['heads'])) {
continue;
}
$this->branches[$data['name']] = $data['target']['hash']; $this->branches[$data['name']] = $data['target']['hash'];
} }
if (empty($branchData['next'])) { if (empty($branchData['next'])) {