Skip to content

Make sure diff always uses the default diff driver when create_patch=True #1832

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 2 commits into from
Feb 28, 2024
Merged

Make sure diff always uses the default diff driver when create_patch=True #1832

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6074f47
feat: :sparkles: added "--no-ext-diff" flag when create_patch=True to…
can-taslicukur Feb 19, 2024
5d6c86a
test: :white_check_mark: Added test for external diff engine and remo…
can-taslicukur Feb 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions git/diff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,8 @@ def diff(

if create_patch:
args.append("-p")
# we expect the default diff driver
args.append("--no-ext-diff")
else:
args.append("--raw")
args.append("-z")
Expand Down