Fix apply_patch rename move path resolution #5486
Merged
+48
−1
Conversation
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
Contributor
Author
|
I have read the CLA Document and I hereby sign the CLA |
pakrym-oai
approved these changes
Oct 22, 2025
Collaborator
|
Thanks for the contribution! |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Fixes #5485.
Fixed rename hunks so
apply_patchresolves the destination path using the verifier’s effective cwd, ensuring patches that run undercd <worktree> && apply_patchstay inside the worktree.Added a regression test (
test_apply_patch_resolves_move_path_with_effective_cwd) that reproduced the old behavior (dest path resolved in the main repo) and now passes.Related to #5483.