From: Jeff King <peff@peff•net>
To: git@vger•kernel.org
Cc: Tian Yuchen <a3205153416@gmail•com>, Scott Baker <scott@perturb•org>
Subject: [PATCH v2 0/8] some diff-highlight tweaks
Date: Mon, 23 Mar 2026 02:01:39 -0400 [thread overview]
Message-ID: <20260323060139.GA10215@coredump.intra.peff.net> (raw)
In-Reply-To: <20260320004138.GA3653623@coredump.intra.peff.net>
Here's a re-roll based on the review from Yuchen. The two changes are:
1. Added a missing &&-chain in patch 3 (which cascades into patch 6).
2. Avoid length(undef), since old perl versions will warn about it.
Patch list and range diff below.
1: c59dd0aac9 = 1: c59dd0aac9 contrib/diff-highlight: do not highlight identical pairs
2: 16aa04fc6d = 2: 16aa04fc6d diff-highlight: mention build instructions
3: 55788fac3a = 3: 55788fac3a diff-highlight: drop perl version dependency back to 5.8
4: 7c2af2348b ! 4: 1101c94f65 diff-highlight: check diff-highlight exit status in tests
@@ contrib/diff-highlight/t/t9400-diff-highlight.sh: dh_test () {
- "$DIFF_HIGHLIGHT" <diff.raw | test_strip_patch_header >diff.act &&
- "$DIFF_HIGHLIGHT" <commit.raw | test_strip_patch_header >commit.act &&
+ "$DIFF_HIGHLIGHT" <diff.raw >diff.hi &&
-+ test_strip_patch_header <diff.hi >diff.act
++ test_strip_patch_header <diff.hi >diff.act &&
+ "$DIFF_HIGHLIGHT" <commit.raw >commit.hi &&
+ test_strip_patch_header <commit.hi >commit.act &&
test_cmp patch.exp diff.act &&
5: 52f0358329 = 5: 65420b8b79 t: add matching negative attributes to test_decode_color
6: 0f1aacf264 ! 6: 60977c32f6 diff-highlight: use test_decode_color in tests
@@ contrib/diff-highlight/t/t9400-diff-highlight.sh: dh_test () {
} >/dev/null &&
"$DIFF_HIGHLIGHT" <diff.raw >diff.hi &&
-- test_strip_patch_header <diff.hi >diff.act
-+ test_strip_patch_header <diff.hi | test_decode_color >diff.act
+- test_strip_patch_header <diff.hi >diff.act &&
++ test_strip_patch_header <diff.hi | test_decode_color >diff.act &&
"$DIFF_HIGHLIGHT" <commit.raw >commit.hi &&
- test_strip_patch_header <commit.hi >commit.act &&
+ test_strip_patch_header <commit.hi | test_decode_color >commit.act &&
7: 8bad893f09 = 7: bf33329640 diff-highlight: test color config
8: 179f83d791 = 8: ea71a8b648 diff-highlight: allow module callers to pass in color config
9: b8ff37b193 ! 9: aab7912ca2 diff-highlight: fetch all config with one process
@@ contrib/diff-highlight/DiffHighlight.pm: sub highlight_stdin {
+ our $cached_config;
my ($key, $default) = @_;
- my $s = `git config --get-color $key 2>$NULL`;
+- return length($s) ? $s : $default;
+
+ if (!defined $cached_config) {
+ $cached_config = {};
@@ contrib/diff-highlight/DiffHighlight.pm: sub highlight_stdin {
+ }
+
+ my $s = $cached_config->{$key};
- return length($s) ? $s : $default;
++ return defined($s) ? $s : $default;
}
+ sub show_hunk {
@@ contrib/diff-highlight/DiffHighlight.pm: sub load_color_config {
# always be set if you want highlighting to do anything.
if (!defined $OLD_HIGHLIGHT[1]) {
[1/8]: diff-highlight: mention build instructions
[2/8]: diff-highlight: drop perl version dependency back to 5.8
[3/8]: diff-highlight: check diff-highlight exit status in tests
[4/8]: t: add matching negative attributes to test_decode_color
[5/8]: diff-highlight: use test_decode_color in tests
[6/8]: diff-highlight: test color config
[7/8]: diff-highlight: allow module callers to pass in color config
[8/8]: diff-highlight: fetch all config with one process
contrib/diff-highlight/DiffHighlight.pm | 59 +++++++++++-----
contrib/diff-highlight/README | 19 +++++-
.../diff-highlight/t/t9400-diff-highlight.sh | 67 +++++++++++++------
t/test-lib-functions.sh | 3 +
4 files changed, 112 insertions(+), 36 deletions(-)
next prev parent reply other threads:[~2026-03-23 6:01 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-20 0:41 [PATCH 0/8] some diff-highlight tweaks Jeff King
2026-03-20 0:42 ` [PATCH 1/8] diff-highlight: mention build instructions Jeff King
2026-03-20 0:42 ` [PATCH 2/8] diff-highlight: drop perl version dependency back to 5.8 Jeff King
2026-03-20 0:43 ` [PATCH 3/8] diff-highlight: check diff-highlight exit status in tests Jeff King
2026-03-20 0:43 ` [PATCH 4/8] t: add matching negative attributes to test_decode_color Jeff King
2026-03-20 0:44 ` [PATCH 5/8] diff-highlight: use test_decode_color in tests Jeff King
2026-03-22 17:24 ` Tian Yuchen
2026-03-22 20:47 ` Jeff King
2026-03-23 5:48 ` Tian Yuchen
2026-03-23 5:53 ` Jeff King
2026-03-20 0:45 ` [PATCH 6/8] diff-highlight: test color config Jeff King
2026-03-20 0:47 ` [PATCH 7/8] diff-highlight: allow module callers to pass in " Jeff King
2026-03-20 0:48 ` [PATCH 8/8] diff-highlight: fetch all config with one process Jeff King
2026-03-22 17:18 ` Tian Yuchen
2026-03-22 20:45 ` Jeff King
2026-03-23 5:39 ` Tian Yuchen
2026-03-23 5:57 ` Jeff King
2026-03-23 6:01 ` Jeff King [this message]
2026-03-23 6:01 ` [PATCH v2 1/8] diff-highlight: mention build instructions Jeff King
2026-03-23 6:02 ` [PATCH v2 2/8] diff-highlight: drop perl version dependency back to 5.8 Jeff King
2026-03-23 6:02 ` [PATCH v2 3/8] diff-highlight: check diff-highlight exit status in tests Jeff King
2026-03-23 6:02 ` [PATCH v2 4/8] t: add matching negative attributes to test_decode_color Jeff King
2026-03-23 6:02 ` [PATCH v2 5/8] diff-highlight: use test_decode_color in tests Jeff King
2026-03-23 6:02 ` [PATCH v2 6/8] diff-highlight: test color config Jeff King
2026-03-23 6:02 ` [PATCH v2 7/8] diff-highlight: allow module callers to pass in " Jeff King
2026-03-23 6:02 ` [PATCH v2 8/8] diff-highlight: fetch all config with one process Jeff King
2026-03-23 16:38 ` [PATCH v2 0/8] some diff-highlight tweaks Junio C Hamano
2026-03-24 6:50 ` Patrick Steinhardt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260323060139.GA10215@coredump.intra.peff.net \
--to=peff@peff$(echo .)net \
--cc=a3205153416@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=scott@perturb$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox