Merge git://git.kernel.org/pub/scm/gitk/gitk

diff --git a/t/t5100-mailinfo.sh b/t/t5100-mailinfo.sh
index 5a4610b8607cc47bc813291ecb7a16085f7f5393..577ecc210a55a5da10552a4415c4cbb5e321039b 100755 (executable)
--- a/t/t5100-mailinfo.sh
+++ b/t/t5100-mailinfo.sh
@@ -27,11 +27,20 @@ done
 
 test_expect_success 'respect NULs' '
 
-       git mailsplit -d3 -o. ../t5100/nul &&
-       cmp ../t5100/nul 001 &&
+       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