Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: consider 'defaultBranch' setting when doing git clone #26810

Merged

Conversation

matemijolovic
Copy link
Contributor

@matemijolovic matemijolovic commented Jan 22, 2024

Changes

This PR fixes the issue where the global config flags bbUseDevelopmentBranch and baseBranches don't work in a specific case.
It manifests as Renovate's inability to find the renovate.json config which is available in one of the baseBranches or in a DEVELOPMENT branch on Bitbucket, but not available on main branch which is mistakenly cloned.

For our usecase, this happens when onboarding a new repository - we treat our main branch as a "production" branch and don't merge renovate.json inside instantly - due to this bug we are unable to onboard repositories with a development branch in a standardized way.

Context

#26805

This is my first contribution to Renovate so please let me know if anything can be further improved.

Documentation (please check one with an [x])

  • I have updated the documentation, or
  • No documentation update is required

How I've tested my work (please select one)

I have verified these changes via:

  • Code inspection only, or
  • Newly added/modified unit tests, or
  • No unit tests but ran on a real repository, or
  • Both unit tests + ran on a real repository

@CLAassistant
Copy link

CLAassistant commented Jan 22, 2024

CLA assistant check
All committers have signed the CLA.

viceice
viceice previously approved these changes Jan 23, 2024
lib/util/git/types.ts Outdated Show resolved Hide resolved
@secustor secustor added this pull request to the merge queue Jan 23, 2024
Merged via the queue into renovatebot:main with commit 6f37a9b Jan 23, 2024
36 checks passed
@renovate-release
Copy link
Collaborator

🎉 This PR is included in version 37.148.1 🎉

The release is available on:

Your semantic-release bot 📦🚀

rvanbutselaar pushed a commit to rvanbutselaar/renovate that referenced this pull request Feb 2, 2024
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 23, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants