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

[PATCH v2 5/8] diff-highlight: use test_decode_color in tests

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

The diff-highlight tests use raw color bytes when comparing expected and actual output. Let's use test_decode_color, which is our usual technique in other tests. It makes reading test output diffs a bit easier, since you're not relying on your terminal to interpret the result (or worse, interpreting characters yourself via "cat -A").

This will also make it easier to add tests with new colors/attributes, without having to pre-define the byte sequences ourselves.

Signed-off-by: Jeff King <peff@peff.net>
---
 .../diff-highlight/t/t9400-diff-highlight.sh  | 37 +++++++++----------
 1 file changed, 17 insertions(+), 20 deletions(-)
diff --git a/contrib/diff-highlight/t/t9400-diff-highlight.sh b/contrib/diff-highlight/t/t9400-diff-highlight.sh
index 7ebff8b18f..4f3d55a26e 100755
--- a/contrib/diff-highlight/t/t9400-diff-highlight.sh
+++ b/contrib/diff-highlight/t/t9400-diff-highlight.sh
@@ -7,9 +7,6 @@ TEST_OUTPUT_DIRECTORY=$(pwd)
 TEST_DIRECTORY="$CURR_DIR"/../../../t
 DIFF_HIGHLIGHT="$CURR_DIR"/../diff-highlight
 
-CW="$(printf "\033[7m")"	# white
-CR="$(printf "\033[27m")"	# reset
-
 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 . "$TEST_DIRECTORY"/test-lib.sh
@@ -42,9 +39,9 @@ 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 &&
 	"$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 &&
 	test_cmp patch.exp diff.act &&
 	test_cmp patch.exp commit.act
 }
@@ -126,8 +123,8 @@ test_expect_success 'diff-highlight highlights the beginning of a line' '
 	dh_test a b <<-EOF
 		@@ -1,3 +1,3 @@
 		 aaa
-		-${CW}b${CR}bb
-		+${CW}0${CR}bb
+		-<REVERSE>b<NOREVERSE>bb
+		+<REVERSE>0<NOREVERSE>bb
 		 ccc
 	EOF
 '
@@ -148,8 +145,8 @@ test_expect_success 'diff-highlight highlights the end of a line' '
 	dh_test a b <<-EOF
 		@@ -1,3 +1,3 @@
 		 aaa
-		-bb${CW}b${CR}
-		+bb${CW}0${CR}
+		-bb<REVERSE>b<NOREVERSE>
+		+bb<REVERSE>0<NOREVERSE>
 		 ccc
 	EOF
 '
@@ -170,8 +167,8 @@ test_expect_success 'diff-highlight highlights the middle of a line' '
 	dh_test a b <<-EOF
 		@@ -1,3 +1,3 @@
 		 aaa
-		-b${CW}b${CR}b
-		+b${CW}0${CR}b
+		-b<REVERSE>b<NOREVERSE>b
+		+b<REVERSE>0<NOREVERSE>b
 		 ccc
 	EOF
 '
@@ -213,8 +210,8 @@ test_expect_failure 'diff-highlight highlights mismatched hunk size' '
 	dh_test a b <<-EOF
 		@@ -1,3 +1,3 @@
 		 aaa
-		-b${CW}b${CR}b
-		+b${CW}0${CR}b
+		-b<REVERSE>b<NOREVERSE>b
+		+b<REVERSE>0<NOREVERSE>b
 		+ccc
 	EOF
 '
@@ -232,8 +229,8 @@ test_expect_success 'diff-highlight treats multibyte utf-8 as a unit' '
 	echo "unic${o_stroke}de" >b &&
 	dh_test a b <<-EOF
 		@@ -1 +1 @@
-		-unic${CW}${o_accent}${CR}de
-		+unic${CW}${o_stroke}${CR}de
+		-unic<REVERSE>${o_accent}<NOREVERSE>de
+		+unic<REVERSE>${o_stroke}<NOREVERSE>de
 	EOF
 '
 
@@ -250,8 +247,8 @@ test_expect_failure 'diff-highlight treats combining code points as a unit' '
 	echo "unico${combine_circum}de" >b &&
 	dh_test a b <<-EOF
 		@@ -1 +1 @@
-		-unic${CW}o${combine_accent}${CR}de
-		+unic${CW}o${combine_circum}${CR}de
+		-unic<REVERSE>o${combine_accent}<NOREVERSE>de
+		+unic<REVERSE>o${combine_circum}<NOREVERSE>de
 	EOF
 '
 
@@ -333,12 +330,12 @@ test_expect_success 'diff-highlight handles --graph with leading dash' '
 	+++ b/file
 	@@ -1,3 +1,3 @@
 	 before
-	-the ${CW}old${CR} line
-	+the ${CW}new${CR} line
+	-the <REVERSE>old<NOREVERSE> line
+	+the <REVERSE>new<NOREVERSE> line
 	 -leading dash
 	EOF
 	git log --graph -p -1 | "$DIFF_HIGHLIGHT" >actual.raw &&
-	trim_graph <actual.raw | sed -n "/^---/,\$p" >actual &&
+	trim_graph <actual.raw | sed -n "/^---/,\$p" | test_decode_color >actual &&
 	test_cmp expect actual
 '
 
-- 
2.53.0.1051.ga14e96f895
Previous: Jeff KingNext: Jeff King
Message 23 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.