Skip to content

Fix autoport fetching into the existing branch - again#16411

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

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

Conversation

@chrisvest
Copy link
Copy Markdown
Member

@chrisvest chrisvest commented Mar 3, 2026

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.

Reapplies and fixes "Fix autoport fetching into the existing branch" (#16410)

This reverts commit 42ee99d.

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.

Reapplies and fixes "Fix autoport fetching into the existing branch" (netty#16410)

This reverts commit 42ee99d.
@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 changed the title Motivation: Fix autoport fetching into the existing branch - again Mar 3, 2026
@normanmaurer normanmaurer merged commit 5750880 into netty:4.2 Mar 4, 2026
23 checks passed
netty-project-bot pushed a commit that referenced this pull request Mar 4, 2026
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.

Reapplies and fixes "Fix autoport fetching into the existing branch"
(#16410)

This reverts commit 42ee99d.

(cherry picked from commit 5750880)
netty-project-bot pushed a commit that referenced this pull request Mar 4, 2026
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.

Reapplies and fixes "Fix autoport fetching into the existing branch"
(#16410)

This reverts commit 42ee99d.

(cherry picked from commit 5750880)
@netty-project-bot
Copy link
Copy Markdown
Contributor

Auto-port PR for 5.0: #16416

@netty-project-bot
Copy link
Copy Markdown
Contributor

Auto-port PR for 4.1: #16417

@github-actions github-actions Bot removed the needs-cherry-pick-5.0 This PR should be cherry-picked to 5.0 once merged. label Mar 4, 2026
@github-actions github-actions Bot removed the needs-cherry-pick-4.1 This PR should be cherry-picked to 4.1 once merged. label Mar 4, 2026
@chrisvest chrisvest deleted the 4.2-fix-42-autoport branch March 5, 2026 06:13
normanmaurer pushed a commit that referenced this pull request Mar 5, 2026
…#16417)

Auto-port of #16411 to 4.1
Cherry-picked commit: 5750880

---
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.

Reapplies and fixes "Fix autoport fetching into the existing branch"
(#16410)

This reverts commit 42ee99d.

Co-authored-by: Chris Vest <[email protected]>
normanmaurer pushed a commit that referenced this pull request Mar 5, 2026
…#16416)

Auto-port of #16411 to 5.0
Cherry-picked commit: 5750880

---
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.

Reapplies and fixes "Fix autoport fetching into the existing branch"
(#16410)

This reverts commit 42ee99d.

Co-authored-by: Chris Vest <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants