Apply 7.4 reset-formats patch with GNU patch (fuzz), pin module-rest ^3.4#242
Merged
TavoNiievez merged 1 commit intoJun 25, 2026
Merged
Conversation
…^3.4 git apply needs exact context, so the patch breaks when unrelated lines shift on the test branch (Messenger .env/routes additions, lock refreshes). GNU patch --fuzz tolerates that, so the patch keeps applying without a rebuild.
TavoNiievez
force-pushed
the
fix/ci-resetformats-patch-fuzz
branch
from
0650908 to
c822855
Compare
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.
Problem
The Symfony 7.4 functional job applies
resetFormatsAfterRequest_issue_test.patchwithgit apply, which needs exact context. Any unrelated change on the test branch — the Messenger PR's.env/config/routes.phpadditions, or acomposer.lock/symfony.lockrefresh shifting lines — breaks it and forces a patch rebuild.Fix
patch -p1 --fuzz=3(tolerates line offsets and context drift), so the patch keeps applying without a rebuild.codeception/module-rest:^3.4.Validated locally on Symfony 7.4: full
Functionalsuite green (137 tests, 258 assertions).