-
-
Notifications
You must be signed in to change notification settings - Fork 2.1k
fix(git diff): Suppress diff.external
#12007
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix(git diff): Suppress diff.external
#12007
Conversation
GIT_EXTERNAL_DIFF overrides diff.external, but it should be OK to override just for diff Also override diff.tool Also need to override for git-log and friends for delta https://dandavison.github.io/delta/configuration.html -- |
diff.external
diff.external
0cb35a2
to
8604ca2
Compare
It is probably enough to set diff.external in GitCommandConfiguration.cs but this handles overrides in gitattributes diff.tool should be overridden in GitCommandConfiguration though core.pager could be separate. |
I tried to set "diff.external" to an empty string in Feel free to take over this PR. |
Doesn't git recognize that the output is redirected and that's why does not use a pager? |
All fine:
diff.tool not needed here. setting external diff in .gitattrbutes will still cause git-log etc to fail in some situations, not sure if it applies to GE use. Not now
Seem so |
I see very low risk in adding the argument "--no-ext-diff". |
Fixes #12006
Proposed changes
--no-ext-diff
to all 6 foundgit diff
commands in order to suppress a possibly configureddiff.external
toolScreenshots
N/A
Test methodology
Merge strategy
I agree that the maintainer squash merge this PR (if the commit message is clear).
✒️ I contribute this code under The Developer Certificate of Origin.