Pass --no-ext-diff to internal git diff in standalone mode#2167
Open
xfocus3 wants to merge 1 commit into
Open
Conversation
When invoked as `delta file1 file2`, delta runs `git diff --no-index` and colorizes the result. That invocation honored the user's `diff.external` git config (e.g. `difft`), so the external differ's output was used instead of delta's, even outside any git repository. Pass `--no-ext-diff` so delta always gets git's own diff output to format. Closes dandavison#2046
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
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.
Description
Closes #2046.
When delta is invoked as
delta file1 file2, it builds and runsgit diff --no-index --color ...and then colorizes git's diff output. That invocation reads the user's git config, so a configureddiff.external(e.g.external = difft) takes over and delta ends up paging the external differ's output instead of producing its own — even when you're not inside a git repository.Fix
Pass
--no-ext-diffto the internalgit diffinvocation. This is git's canonical flag to ignore any configureddiff.externalfor that command, so delta always receives git's own diff to format. The plaindifffallback path (used on git < 2.42 with process substitution) is unaffected since it doesn't read git config.Verification
With
diff.externalconfigured to a marker script, before this change delta emitted the external differ's output; after it, delta produces its own diff and the external command is not invoked:cargo test(155 passed),cargo clippy, andcargo fmt --checkall pass.