Merge branch 'as/api-allocation-doc' into maint

diff --git a/t/t4205-log-pretty-formats.sh b/t/t4205-log-pretty-formats.sh
index 2ae9faa8b37821db6e7c28ae3d98e53cb25264b1..98a43d457a3de96fd9aa728610db7d8b3fdd241d 100755 (executable)
--- a/t/t4205-log-pretty-formats.sh
+++ b/t/t4205-log-pretty-formats.sh
@@ -71,4 +71,32 @@ test_expect_success 'alias loop' '
        test_must_fail git log --pretty=test-foo
 '
 
+test_expect_success 'NUL separation' '
+       printf "add bar\0initial" >expected &&
+       git log -z --pretty="format:%s" >actual &&
+       test_cmp expected actual
+'
+
+test_expect_success 'NUL termination' '
+       printf "add bar\0initial\0" >expected &&
+       git log -z --pretty="tformat:%s" >actual &&
+       test_cmp expected actual
+'
+
+test_expect_success 'NUL separation with --stat' '
+       stat0_part=$(git diff --stat HEAD^ HEAD) &&
+       stat1_part=$(git diff-tree --no-commit-id --stat --root HEAD^) &&
+       printf "add bar\n$stat0_part\n\0initial\n$stat1_part\n" >expected &&
+       git log -z --stat --pretty="format:%s" >actual &&
+       test_i18ncmp expected actual
+'
+
+test_expect_failure 'NUL termination with --stat' '
+       stat0_part=$(git diff --stat HEAD^ HEAD) &&
+       stat1_part=$(git diff-tree --no-commit-id --stat --root HEAD^) &&
+       printf "add bar\n$stat0_part\n\0initial\n$stat1_part\n\0" >expected &&
+       git log -z --stat --pretty="tformat:%s" >actual &&
+       test_i18ncmp expected actual
+'
+
 test_done