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

[PATCH v2 6/8] diff-highlight: test color config

From
Jeff King <peff@peff.net>
Date
Mar 23, 2026, 06:02 UTC
Message-ID
<20260323060213.GF10482@coredump.intra.peff.net>
In-Reply-To
<20260323060139.GA10215@coredump.intra.peff.net>

We added configurable colors long ago in bca45fbc1f (diff-highlight: allow configurable colors, 2014-11-20), but never actually tested it. Since we'll be touching the color code in a moment, this is a good time to beef up the tests.

Note that we cover both the highlight/reset style used by the default colors, as well as the normal/highlight style added by that commit (which was previously totally untested).

Signed-off-by: Jeff King <peff@peff.net>
---
 .../diff-highlight/t/t9400-diff-highlight.sh  | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
diff --git a/contrib/diff-highlight/t/t9400-diff-highlight.sh b/contrib/diff-highlight/t/t9400-diff-highlight.sh
index 4f3d55a26e..b38fe2196a 100755
--- a/contrib/diff-highlight/t/t9400-diff-highlight.sh
+++ b/contrib/diff-highlight/t/t9400-diff-highlight.sh
@@ -350,4 +350,32 @@ test_expect_success 'highlight diff that removes final newline' '
 	EOF
 '
 
+test_expect_success 'configure set/reset colors' '
+	test_config color.diff-highlight.oldhighlight bold &&
+	test_config color.diff-highlight.oldreset nobold &&
+	test_config color.diff-highlight.newhighlight italic &&
+	test_config color.diff-highlight.newreset noitalic &&
+	echo "prefix a suffix" >a &&
+	echo "prefix b suffix" >b &&
+	dh_test a b <<-\EOF
+	@@ -1 +1 @@
+	-prefix <BOLD>a<NORMAL_INTENSITY> suffix
+	+prefix <ITALIC>b<NOITALIC> suffix
+	EOF
+'
+
+test_expect_success 'configure normal/highlight colors' '
+	test_config color.diff-highlight.oldnormal red &&
+	test_config color.diff-highlight.oldhighlight magenta &&
+	test_config color.diff-highlight.newnormal green &&
+	test_config color.diff-highlight.newhighlight yellow &&
+	echo "prefix a suffix" >a &&
+	echo "prefix b suffix" >b &&
+	dh_test a b <<-\EOF
+	@@ -1 +1 @@
+	<RED>-prefix <RESET><MAGENTA>a<RESET><RED> suffix<RESET>
+	<GREEN>+prefix <RESET><YELLOW>b<RESET><GREEN> suffix<RESET>
+	EOF
+'
+
 test_done
-- 
2.53.0.1051.ga14e96f895
Previous: Jeff KingNext: Jeff King
Message 24 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.