Skip to content

fix(branchPrefix): include base branch name iff multiple bases expected#35423

Merged
secustor merged 19 commits intorenovatebot:mainfrom
RahulGautamSingh:fix-34937
Oct 20, 2025
Merged

fix(branchPrefix): include base branch name iff multiple bases expected#35423
secustor merged 19 commits intorenovatebot:mainfrom
RahulGautamSingh:fix-34937

Conversation

@RahulGautamSingh
Copy link
Copy Markdown
Collaborator

@RahulGautamSingh RahulGautamSingh commented Apr 17, 2025

Changes

Instead of setting branchPrefix only incase multiple base branches are found, use it when multiple baseBranches are expected.
If there is any regex pattern in the baseBranches array or it's length is > 1, we expect multiple base branches.

Context

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

Tested on the reproductions linked in this discussion

  1. Update alpine Docker tag to v3.21 (main) Rahul-renovate-testing/renovate-baseBranch-doesnt-exist-regex#1
  2. Update alpine Docker tag to v3.21 (main) Rahul-renovate-testing/renovate-baseBranch-doesnt-exist-literal#1

Comment thread lib/workers/repository/init/index.ts Outdated
Comment thread lib/workers/repository/init/index.ts Outdated
Copy link
Copy Markdown
Member

@viceice viceice left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

otherwise LGTM

Comment thread lib/workers/repository/init/index.spec.ts Outdated
Comment thread lib/workers/repository/init/index.ts Outdated
Comment thread lib/workers/repository/process/index.spec.ts Outdated
Comment thread lib/workers/repository/process/index.ts Outdated
Comment thread lib/util/multiple-base-branches.ts Outdated
Comment thread lib/workers/repository/process/index.ts Outdated
Copy link
Copy Markdown
Member

@viceice viceice left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@RahulGautamSingh

This comment was marked as outdated.

@RahulGautamSingh RahulGautamSingh marked this pull request as draft May 4, 2025 19:48
@RahulGautamSingh RahulGautamSingh marked this pull request as ready for review July 29, 2025 06:14
@rarkins rarkins removed their request for review August 16, 2025 08:21
Copy link
Copy Markdown
Member

@viceice viceice left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

test failures

@RahulGautamSingh RahulGautamSingh changed the title fix: use branchPrefix if multiple baseBranches expected fix: use base branch name in branchPrefix if multiple base branches expected Oct 18, 2025
@RahulGautamSingh RahulGautamSingh changed the title fix: use base branch name in branchPrefix if multiple base branches expected fix(branchPrefix): include base branch name iff multiple bases expected Oct 18, 2025
@secustor secustor added this pull request to the merge queue Oct 20, 2025
Merged via the queue into renovatebot:main with commit 95ea2c9 Oct 20, 2025
39 checks passed
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Nov 20, 2025
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.

Use baseBranch prefix whenever there's patterns

5 participants