aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-09-09 12:54:02 -0700
committerJunio C Hamano <gitster@pobox.com>2014-09-09 12:54:02 -0700
commit1764e8124e441a84b4764da0f8e6b0c900c44941 (patch)
tree392cc5ba3df866f718a08c5aa3e0e5e639dd62af /t
parent27fbcf8267ecc484cafdbfe84a3aaf2f373f3e2a (diff)
parent430875969a5229c1d306e4cc5acc8c8afe2b50a3 (diff)
downloadgit-1764e8124e441a84b4764da0f8e6b0c900c44941.tar.gz
git-1764e8124e441a84b4764da0f8e6b0c900c44941.tar.xz
Merge branch 'nd/strbuf-utf8-replace'
* nd/strbuf-utf8-replace: utf8.c: fix strbuf_utf8_replace() consuming data beyond input string
Diffstat (limited to 't')
-rwxr-xr-xt/t4205-log-pretty-formats.sh7
1 files changed, 7 insertions, 0 deletions
diff --git a/t/t4205-log-pretty-formats.sh b/t/t4205-log-pretty-formats.sh
index 349c53198..de0cc4a0f 100755
--- a/t/t4205-log-pretty-formats.sh
+++ b/t/t4205-log-pretty-formats.sh
@@ -431,6 +431,13 @@ EOF
test_cmp expected actual
'
+test_expect_success 'strbuf_utf8_replace() not producing NUL' '
+ git log --color --pretty="tformat:%<(10,trunc)%s%>>(10,ltrunc)%C(auto)%d" |
+ test_decode_color |
+ nul_to_q >actual &&
+ ! grep Q actual
+'
+
# get new digests (with no abbreviations)
head1=$(git rev-parse --verify HEAD~0) &&
head2=$(git rev-parse --verify HEAD~1) &&