Skip to content

Fix autoport fetching into the existing branch#16403

Merged
normanmaurer merged 1 commit into
netty:4.2from
chrisvest:4.2-fix-42-autoport
Mar 3, 2026
Merged

Fix autoport fetching into the existing branch#16403
normanmaurer merged 1 commit into
netty:4.2from
chrisvest:4.2-fix-42-autoport

Conversation

@chrisvest
Copy link
Copy Markdown
Member

Motivation:
There's no need to specifically fetch and create the target port branch if that is already the default branch of the checkout. Doing so will just make the fetch fail.

Modification:
Only fetch the target branch if it is different from the current branch.

Result:
We can now autoport into the default branch.

Motivation:
There's no need to specifically fetch and create the target port branch if that is already the default branch of the checkout.
Doing so will just make the fetch fail.

Modification:
Only fetch the target branch if it is different from the current branch.

Result:
We can now autoport into the default branch.
@chrisvest chrisvest added this to the 4.2.11.Final milestone Mar 3, 2026
@chrisvest chrisvest added needs-cherry-pick-4.1 This PR should be cherry-picked to 4.1 once merged. needs-cherry-pick-5.0 This PR should be cherry-picked to 5.0 once merged. labels Mar 3, 2026
@chrisvest chrisvest requested a review from normanmaurer March 3, 2026 01:22
@normanmaurer normanmaurer merged commit 989bacf into netty:4.2 Mar 3, 2026
23 checks passed
@netty-project-bot
Copy link
Copy Markdown
Contributor

Could not create auto-port PR.
Got conflicts when cherry-picking onto 4.1.

@netty-project-bot
Copy link
Copy Markdown
Contributor

Could not create auto-port PR.
Got conflicts when cherry-picking onto 5.0.

chrisvest added a commit that referenced this pull request Mar 3, 2026
chrisvest added a commit that referenced this pull request Mar 3, 2026
@chrisvest chrisvest deleted the 4.2-fix-42-autoport branch March 3, 2026 22:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

needs-cherry-pick-4.1 This PR should be cherry-picked to 4.1 once merged. needs-cherry-pick-5.0 This PR should be cherry-picked to 5.0 once merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants