Backport #3504 from main to stable branch#3508
Merged
Merged
Conversation
Fix regression introduced in 8.4.0 by pallets#3126 and properly fix pallets#3043 and pallets#3502
kdeldycke
changed the title
main to `stable branch
This was
linked to
issues
May 23, 2026
kdeldycke
changed the title
main to `stable branchmain to stable branch
kdeldycke
force-pushed
the
fix-fish-completion-stable
branch
from
93dd288 to
ddf20d0
Compare
Collaborator
Author
|
For reference, I manually merged |
Collaborator
|
@kdeldycke Thanks! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
My intention was to merge #3504 to
stableto include it for the upcoming 8.4.2 release, but was distracted by the topic of the PR itself and forgot to retarget the base branch of the PR frommaintostable. This is the well known issue discussed at #3337.To fix this, this PR just cherry-pick the c353590 commit from
mainand targetstableinclusion. The next sync ofstabletomainwill be clean and be reconciled automaticcaly by a forward-merge.As a bonus, I added the missing changelog entry for #3504, updated the admonition and added a regression test.