Repository navigation
Use standard prefixes for parsed patch diffs - #2191
Merged
Byron merged 1 commit intoJul 26, 2026
Merged
Byron merged 1 commit into
Byron merged 1 commit into
Conversation
Copy link
Copy Markdown
Contributor
Sorry, something went wrong.
Copy link
Copy Markdown
Contributor
There was a problem hiding this comment.
Pull request overview
This PR makes GitPython’s create_patch=True diff parsing robust against user Git configuration diff.mnemonicPrefix=true by forcing the standard a/ and b/ prefixes only for the patch output that GitPython parses into Diff objects.
Changes:
- Apply a temporary -c diff.mnemonicPrefix=false git-option for patch-formatted diffs generated by the shared Diffable.diff() path.
- Apply the same temporary option for IndexFile.diff() when diffing against the empty tree (NULL_TREE path).
- Add a regression test asserting patch diffs parse correctly under diff.mnemonicPrefix=true and that the config remains unchanged for subsequent commands.
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| test/test_diff.py | Adds regression coverage for parsing patch diffs when diff.mnemonicPrefix=true, including NULL_TREE and ensuring no option leakage. |
| git/index/base.py | Forces standard prefixes for parsed patch output in the index’s empty-tree diff path. |
| git/diff.py | Forces standard prefixes for parsed patch output in the shared Diffable.diff() implementation when create_patch=True. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Sorry, something went wrong.
Byron
approved these changes
Jul 26, 2026
Byron
left a comment
Copy link
Copy Markdown
Member
There was a problem hiding this comment.
Thanks, LGTM.
Sorry, something went wrong.
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
Reviewers
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.
Summary
Fixes #2013.
Validation
Note: the complete test/test_diff.py run has one pre-existing failure in TestDiff.test_diff_with_staged_file on this local Git version; the focused regression passes.
AI agent disclosure
This pull request was prepared and submitted by OpenAI Codex acting as an AI agent through the contributor account.