aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLorenzoPegorari <lorenzo.pegorari2002@gmail.com>2026-01-16 01:05:38 +0100
committerJunio C Hamano <gitster@pobox.com>2026-01-17 09:47:27 -0800
commit04f5d95ef7715e952c93f078e2973c44bb6f3396 (patch)
treede2c69dd194fad76d8ebd75b1e01820b0486d62e
parentf85b49f3d4af5ee0b428285799ac711d6abe1cfb (diff)
downloadgit-04f5d95ef7715e952c93f078e2973c44bb6f3396.tar.xz
t4073: add test for diffstat paths length when containing UTF-8 chars
Add test checking the length of filepaths containing UTF-8 chars when generating a diffstat with various `name-width`s. Signed-off-by: LorenzoPegorari <lorenzo.pegorari2002@gmail.com> [jc: fixed up t/meson.build to spell the name of the new test file correctly] Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--t/meson.build1
-rwxr-xr-xt/t4073-diff-stat-name-width.sh61
2 files changed, 62 insertions, 0 deletions
diff --git a/t/meson.build b/t/meson.build
index a5531df415..73edae4e3d 100644
--- a/t/meson.build
+++ b/t/meson.build
@@ -496,6 +496,7 @@ integration_tests = [
't4070-diff-pairs.sh',
't4071-diff-minimal.sh',
't4072-diff-max-depth.sh',
+ 't4073-diff-stat-name-width.sh',
't4100-apply-stat.sh',
't4101-apply-nonl.sh',
't4102-apply-rename.sh',
diff --git a/t/t4073-diff-stat-name-width.sh b/t/t4073-diff-stat-name-width.sh
new file mode 100755
index 0000000000..ec5d3c3c1f
--- /dev/null
+++ b/t/t4073-diff-stat-name-width.sh
@@ -0,0 +1,61 @@
+#!/bin/sh
+
+test_description='git-diff check diffstat filepaths length when containing UTF-8 chars'
+
+. ./test-lib.sh
+
+
+create_files () {
+ mkdir -p "d你好" &&
+ touch "d你好/f再见"
+}
+
+test_expect_success 'setup' '
+ git init &&
+ git config core.quotepath off &&
+ git commit -m "Initial commit" --allow-empty &&
+ create_files &&
+ git add . &&
+ git commit -m "Added files"
+'
+
+test_expect_success 'test name-width long enough for filepath' '
+ git diff HEAD~1 HEAD --stat --stat-name-width=12 >out &&
+ grep "d你好/f再见 |" out &&
+ git diff HEAD~1 HEAD --stat --stat-name-width=11 >out &&
+ grep "d你好/f再见 |" out
+'
+
+test_expect_success 'test name-width not long enough for dir name' '
+ git diff HEAD~1 HEAD --stat --stat-name-width=10 >out &&
+ grep ".../f再见 |" out &&
+ git diff HEAD~1 HEAD --stat --stat-name-width=9 >out &&
+ grep ".../f再见 |" out
+'
+
+test_expect_success 'test name-width not long enough for slash' '
+ git diff HEAD~1 HEAD --stat --stat-name-width=8 >out &&
+ grep "...f再见 |" out
+'
+
+test_expect_success 'test name-width not long enough for file name' '
+ git diff HEAD~1 HEAD --stat --stat-name-width=7 >out &&
+ grep "...再见 |" out &&
+ git diff HEAD~1 HEAD --stat --stat-name-width=6 >out &&
+ grep "...见 |" out &&
+ git diff HEAD~1 HEAD --stat --stat-name-width=5 >out &&
+ grep "...见 |" out &&
+ git diff HEAD~1 HEAD --stat --stat-name-width=4 >out &&
+ grep "... |" out
+'
+
+test_expect_success 'test name-width minimum length' '
+ git diff HEAD~1 HEAD --stat --stat-name-width=3 >out &&
+ grep "... |" out &&
+ git diff HEAD~1 HEAD --stat --stat-name-width=2 >out &&
+ grep "... |" out &&
+ git diff HEAD~1 HEAD --stat --stat-name-width=1 >out &&
+ grep "... |" out
+'
+
+test_done