[Backport #1949 to 5.x] Fix regression about unexpected items when augmenting parameters#1950
Merged
Conversation
Contributor
Author
|
Please cherry-pick the changes locally and resolve any conflicts. git fetch origin backport-1949-to-5.x
git worktree add --checkout .worktree/backport-1949-to-5.x backport-1949-to-5.x
cd .worktree/backport-1949-to-5.x
git reset --hard HEAD^
git cherry-pick -x f0717a52c616291ea6599d241fe5c04bbf7e7ef2
git push --force-with-lease |
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
1 participant
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.
Automated backport of #1949 to branch
5.x.Fixes #1931