From: Tian Yuchen Date: Sun, 22 Mar 2026 17:24:00 GMT Subject: Re: [PATCH 5/8] diff-highlight: use test_decode_color in tests Message-ID: In-Reply-To: <20260320004436.GE3654226@coredump.intra.peff.net> On 3/20/26 08:44, Jeff King wrote: > 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 > --- > .../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 42d331c6cd..ba80cda7c8 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.hi && > - test_strip_patch_header diff.act > + test_strip_patch_header diff.act Although this is just simple text filtering and leaving it as is wouldn’t cause any problems IMO, why not go ahead and add the && while you’re at it? I've noticed that there are several missing &&. > "$DIFF_HIGHLIGHT" commit.hi && > - test_strip_patch_header commit.act && > + test_strip_patch_header 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 > + -bbb > + +0bb > 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} > + -bbb > + +bb0 > 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 > + -bbb > + +b0b > 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 > + -bbb > + +b0b > +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${o_accent}de > + +unic${o_stroke}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 > + -unico${combine_accent}de > + +unico${combine_circum}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 old line > + +the new line > -leading dash > EOF > git log --graph -p -1 | "$DIFF_HIGHLIGHT" >actual.raw && > - trim_graph actual && > + trim_graph actual && > test_cmp expect actual > ' > Thanks, Yuchen