blame: allow blame.coloring to specify both --color-lines and --color-by-age
#1449
+111
−12
Conversation
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
rwe
changed the title
blame.coloring to enable both --color-lines and --color-by-ageblame.coloring to specify both --color-lines and --color-by-age
This adds a test verifying `git blame`'s output when run with both `--color-lines` and `--color-by-age`. Those flags are not mutually exclusive and both affect the output format. They were previously only tested independently. Signed-off-by: Robert Estelle <robertestelle@gmail.com>
rwe
force-pushed
the
blame-color-config
branch
from
4c6f5e5 to
8c0c679
Compare
These flags correspond to specific values of the `blame.coloring` config option. This adds a small note mentioning this correspondence. Signed-off-by: Robert Estelle <robertestelle@gmail.com>
`blame.coloring` is now parsed as a comma-separated list, so that both
colorizers ("by age" and "by repeated lines") can be enabled via
configuration. Previously, they could be specified together on the
command line via --color-by-age and --color-lines, but not by config.
Signed-off-by: Robert Estelle <robertestelle@gmail.com>
rwe
force-pushed
the
blame-color-config
branch
from
8c0c679 to
e33ae07
Compare
|
/submit |
|
Submitted as pull.1449.git.git.1675365406.gitgitgadget@gmail.com To fetch this version into To fetch this version to local tag |
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.
The flags
--color-linesand--color-by-ageare not mutually exclusive, and both affect the output format ofgit blame. This adds a test verifyinggit blame's output when run with both, where previously they were only tested independently.blameis then taught to accept multiple values fromblame.coloring, so that both modes can be set by configuration. Previously, the config only permitted one (repeatedLines) or the other (highlightRecent), despite the command line accepting both flags independently. This is a backwards-compatible change that does not alter the interpretation of existing configuration.The list-parsing logic was derived from that of
parse_color_moved_wsindiff.c.