git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v2 0/8] some diff-highlight tweaks

From
Jeff King <peff@peff.net>
Date
Mar 23, 2026, 06:01 UTC
Message-ID
<20260323060139.GA10215@coredump.intra.peff.net>
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(-)
Previous: Jeff KingNext: Jeff King
Message 18 of 28 in “some diff-highlight tweaks”
  1. 0/8 some diff-highlight tweaksJeff King, Mar 20, 2026
  2. 1/8 diff-highlight: mention build instructionsJeff King, Mar 20, 2026
  3. 2/8 diff-highlight: drop perl version dependency back to 5.8Jeff King, Mar 20, 2026
  4. 3/8 diff-highlight: check diff-highlight exit status in testsJeff King, Mar 20, 2026
  5. 4/8 t: add matching negative attributes to test_decode_colorJeff King, Mar 20, 2026
  6. 5/8 diff-highlight: use test_decode_color in testsJeff King, Mar 20, 2026
  7. Tian YuchenMar 22, 2026
  8. Jeff KingMar 22, 2026
  9. Tian YuchenMar 23, 2026
  10. Jeff KingMar 23, 2026
  11. 6/8 diff-highlight: test color configJeff King, Mar 20, 2026
  12. 7/8 diff-highlight: allow module callers to pass in color configJeff King, Mar 20, 2026
  13. 8/8 diff-highlight: fetch all config with one processJeff King, Mar 20, 2026
  14. Tian YuchenMar 22, 2026
  15. Jeff KingMar 22, 2026
  16. Tian YuchenMar 23, 2026
  17. Jeff KingMar 23, 2026
  18. 0/8 some diff-highlight tweaksJeff King, Mar 23, 2026
  19. 1/8 diff-highlight: mention build instructionsJeff King, Mar 23, 2026
  20. 2/8 diff-highlight: drop perl version dependency back to 5.8Jeff King, Mar 23, 2026
  21. 3/8 diff-highlight: check diff-highlight exit status in testsJeff King, Mar 23, 2026
  22. 4/8 t: add matching negative attributes to test_decode_colorJeff King, Mar 23, 2026
  23. 5/8 diff-highlight: use test_decode_color in testsJeff King, Mar 23, 2026
  24. 6/8 diff-highlight: test color configJeff King, Mar 23, 2026
  25. 7/8 diff-highlight: allow module callers to pass in color configJeff King, Mar 23, 2026
  26. 8/8 diff-highlight: fetch all config with one processJeff King, Mar 23, 2026
  27. Junio C HamanoMar 23, 2026
  28. Patrick SteinhardtMar 24, 2026

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.