Merge branch 'jk/index-pack-threading-races'

diff --git a/t/t4205-log-pretty-formats.sh b/t/t4205-log-pretty-formats.sh
index f2f748399d4b3066ef3cf16ae28ec99e698e1d72..9b75399572b1cbe1bfcb00995e1660a93fe6a4c6 100755 (executable)
--- 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
+'
+
 # ISO strict date format
 test_expect_success 'ISO and ISO-strict date formats display the same values' '
        git log --format=%ai%n%ci |