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 6/8] diff-highlight: test color config
Date: Mon, 23 Mar 2026 02:02:13 -0400 [thread overview]
Message-ID: <20260323060213.GF10482@coredump.intra.peff.net> (raw)
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
next prev parent reply other threads:[~2026-03-23 6:02 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 ` [PATCH v2 0/8] some diff-highlight tweaks Jeff King
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 ` Jeff King [this message]
2026-03-23 6:02 ` [PATCH v2 7/8] diff-highlight: allow module callers to pass in color config 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=20260323060213.GF10482@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=a3205153416@gmail.com \
--cc=git@vger.kernel.org \
--cc=scott@perturb.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.