Sync with 1.6.6.2

diff --git a/t/t5100-mailinfo.sh b/t/t5100-mailinfo.sh
index 0279d07c83b1eb6cbcf2add5fc1afd8a27d63fbd..ebc36c1758372f484055b62080d3ce81ae7c69b4 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. "$TEST_DIRECTORY"/t5100/sample.mbox >last &&
        last=`cat last` &&
        echo total is $last &&
-       test `cat last` = 14'
+       test `cat last` = 16'
 
 check_mailinfo () {
        mail=$1 opt=$2
@@ -30,6 +30,10 @@ do
                if test -f "$TEST_DIRECTORY"/t5100/msg$mail--scissors
                then
                        check_mailinfo $mail --scissors
+               fi &&
+               if test -f "$TEST_DIRECTORY"/t5100/msg$mail--no-inbody-headers
+               then
+                       check_mailinfo $mail --no-inbody-headers
                fi
        '
 done