Merge branch 'jc/maint-combine-diff-pre-context' into maint

diff --git a/t/t5100-mailinfo.sh b/t/t5100-mailinfo.sh
index 9b1a74542a848ef702c1e6208d6ff2537b0f6ac0..577ecc210a55a5da10552a4415c4cbb5e321039b 100755 (executable)
--- a/t/t5100-mailinfo.sh
+++ b/t/t5100-mailinfo.sh
@@ -11,7 +11,7 @@ test_expect_success 'split sample box' \
        'git mailsplit -o. ../t5100/sample.mbox >last &&
        last=`cat last` &&
        echo total is $last &&
-       test `cat last` = 8'
+       test `cat last` = 9'
 
 for mail in `echo 00*`
 do
@@ -25,4 +25,22 @@ do
                diff ../t5100/info$mail info$mail"
 done
 
+test_expect_success 'respect NULs' '
+
+       git mailsplit -d3 -o. ../t5100/nul-plain &&
+       cmp ../t5100/nul-plain 001 &&
+       (cat 001 | git mailinfo msg patch) &&
+       test 4 = $(wc -l < patch)
+
+'
+
+test_expect_success 'Preserve NULs out of MIME encoded message' '
+
+       git mailsplit -d5 -o. ../t5100/nul-b64.in &&
+       cmp ../t5100/nul-b64.in 00001 &&
+       git mailinfo msg patch <00001 &&
+       cmp ../t5100/nul-b64.expect patch
+
+'
+
 test_done