fix(diff): place --color flag before pathspec separator - #2933
Merged
Conversation
Owner
|
Awesome find @danny-kuehn , thanks for fixing this. |
Jguer
approved these changes
Jul 30, 2026
|
Just for anyone else who finds this: the behavior still changes compared to before #1243, when diffs would be colorized under This is arguably more consistent, although it is surprising since the behavior changed, and some people might expect that configuring Git to color diffs would also apply to Git diffs within Yay. |
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.
Since #2905, PKGBUILD diffs lose color even with
Colorenabled in pacman.conf.collectPkgbuildDiffsappends--color=always/neverafter the--separator, so git treats it as a pathspec and ignores it. This predates
#2905 but was masked:
Show()gave git a TTY, so auto color worked. WithCapture()git sees a pipe and disables color.Fix: append the color flag before the range and pathspecs.
Tested:
TZ=UTC make test,make lint, and manual diff review with coloron/off. Related: #2905, #1243.