Merge branch '1.4'

main
Jordi Boggiano 7 years ago
commit b3b081234a

@ -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'])) {

Loading…
Cancel
Save