aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLorenzoPegorari <lorenzo.pegorari2002@gmail.com>2026-02-27 22:48:35 +0100
committerJunio C Hamano <gitster@pobox.com>2026-02-27 13:59:22 -0800
commit064b869efc50be2557015665bc3dc8ac9008a6e4 (patch)
treea0233c7d0098a88513f6a4d354d30076ec52ab93
parent1a9df8de368cbebd881336f64e424422f3dbb993 (diff)
downloadgit-064b869efc50be2557015665bc3dc8ac9008a6e4.tar.xz
t4052: test for diffstat width when prefix contains ANSI escape codes
Add test checking the calculation of the diffstat display width when the `line_prefix`, which is text that goes before the diffstat, contains ANSI escape codes. This situation happens, for example, when `git log --stat --graph` is executed: * `--stat` will create a diffstat for each commit * `--graph` will stuff `line_prefix` with the graph portion of the log, which contains ANSI escape codes to color the text Signed-off-by: LorenzoPegorari <lorenzo.pegorari2002@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t4052-stat-output.sh32
1 files changed, 32 insertions, 0 deletions
diff --git a/t/t4052-stat-output.sh b/t/t4052-stat-output.sh
index 740bb97091..7c749062e2 100755
--- a/t/t4052-stat-output.sh
+++ b/t/t4052-stat-output.sh
@@ -413,4 +413,36 @@ test_expect_success 'merge --stat respects COLUMNS with long name' '
test_cmp expect actual
'
+# We want git-log to print only 1 commit containing a single branch graph and a
+# diffstat (the diffstat display width, when not manually set through the
+# option "--stat-width", will be automatically calculated).
+# The diffstat will be only one file, with a placeholder FILENAME, that, with
+# enough terminal display width, will contain the following line:
+# "<RED>|<RESET> ${FILENAME} | 0"
+# where "<RED>" and "<RESET>" are ANSI escape codes to color the text.
+# To calculate the minimium terminal display width MIN_TERM_WIDTH so that the
+# FILENAME in the diffstat will not be shortened, we take the FILENAME length
+# and add 9 to it.
+# To check if the diffstat width, when the line_prefix (the "<RED>|<RESET>" of
+# the graph) contains ANSI escape codes (the ANSI escape codes to color the
+# text), is calculated correctly, we:
+# 1. check if it contains the line defined before when using MIN_TERM_WIDTH
+# 2. check if it contains the line defined before, but with the FILENAME
+# shortened by only one character, when using MIN_TERM_WIDTH - 1
+
+test_expect_success 'diffstat where line_prefix contains ANSI escape codes is correct width' '
+ FILENAME="placeholder-text-placeholder-text" &&
+ FILENAME_TRIMMED="...eholder-text-placeholder-text" &&
+ MIN_TERM_WIDTH=$((${#FILENAME} + 9)) &&
+ test_config color.diff always &&
+ git commit --allow-empty --allow-empty-message &&
+ >${FILENAME} &&
+ git add ${FILENAME} &&
+ git commit --allow-empty-message &&
+ COLUMNS=$((MIN_TERM_WIDTH)) git log --graph --stat -n1 | test_decode_color >out &&
+ test_grep "<RED>|<RESET> ${FILENAME} | 0" out &&
+ COLUMNS=$((MIN_TERM_WIDTH - 1)) git log --graph --stat -n1 | test_decode_color >out &&
+ test_grep "<RED>|<RESET> ${FILENAME_TRIMMED} | 0" out
+'
+
test_done