Derive effective patch paths through Git#30837
Open
bookholt-oai wants to merge 7 commits into
Open
Conversation
…4-git-02-effective-patch-paths
…4-git-02-effective-patch-paths
…4-git-02-effective-patch-paths
…4-git-02-effective-patch-paths
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.
Why
Patch safety checks need to protect the paths Git will actually change. Reading diff headers ourselves can disagree with Git for renames, copies, headerless patches, or misleading cosmetic headers.
If the path list is wrong, later staging and policy checks may guard the wrong files.
What
Ask the trusted Git executable for raw, NUL-delimited
git apply --numstatoutput in both the forward and reverse directions. Include both sides of every rename or copy, then reject malformed, empty, non-UTF-8, non-normalized, or platform-ambiguous paths.How
Reuse this Git-derived path set for staging and patch application instead of maintaining a second path parser.
This PR is stacked on #30833 and should land after it.
Testing
Focused patch-path and full
codex-git-utilstests passed. Coverage includes renames, copies, headerless patches, mismatched headers, forward and reverse application, Windows aliases, and valid Unix filenames.Formatting, fix, and diff checks passed.
31/31 non-Codeownerous CI checks are green at
80d4da92f0, including native Windows; one unrelated flaky check required a single retry.Related: PSEC-4394