Prevent usage of external diff tools#536
Merged
jakubbortlik merged 1 commit intoharrisoncramer:developfrom Mar 25, 2026
Merged
Conversation
Makes `parse_hunks_and_diff` pass `--no-ext-diff` to `git diff` to prevent an external diff tool configured in `~/.gitconfig` clobering the diff output it depends on to parse the hunks.
3 tasks
Collaborator
|
Thanks for your contribution. |
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
2 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.
Makes
parse_hunks_and_diffpass--no-ext-difftogit diffto prevent an external diff tool configured in~/.gitconfigclobering the diff output it depends on to parse the hunks.This resolves some, but likely not all, instances of #386