search

jacekkopecky / vscode-whole-diff

Whole Diff extension for VSCode
MIT License
10 stars 2 forks source link

Compatibility with `diff.external` tool-configuration #4

Closed ELLIOTTCABLE closed 1 month ago

ELLIOTTCABLE commented 1 year ago

I use patdiff, common in the OCaml community, as a diff replacement for most interactive uses. Thus, my diff.external configuration in Git uses that:

$ git config --global diff.external
/home/me/.bin/git-patdiff-wrapper

$ cat /home/me/.bin/git-patdiff-wrapper        
#!/usr/bin/env dash
patdiff "$2" -alt-old "$1 $4" "$5" -alt-new "$1 $7" || true

Unfortunately, this bunks up Whole Diff.

Screenshot 2023-06-27 at 2 38 46 PM

Given that it's manipulating the flags to the gnu diffutils, perhaps the extension should bypass (or have the option to bypass?) any diff.external configuration, and call diff directly?

jacekkopecky commented 1 year ago

Thanks @ELLIOTTCABLE , I haven't considered diff.external.

Do you readily know how to disable it for a given git diff call?

And would you consider submitting a PR? 8-)

jacekkopecky commented 1 month ago

Closing due to inactivity, but feel free to get back to me if you wish.