Merge branch 'ks/maint-1.6.0-mailinfo-folded' into maint-1.6.1

* ks/maint-1.6.0-mailinfo-folded:
  mailinfo: tests for RFC2047 examples
  mailinfo: add explicit test for mails like '<a.u.thor@example.com> (A U Thor)'
  mailinfo: 'From:' header should be unfold as well
  mailinfo: correctly handle multiline 'Subject:' header

diff --cc t/t5100-mailinfo.sh
index fe14589427643b9bb7759c597935da724adf1a64,b851b3a1758ee2efd62aee86c988024b10cb3e7b..e70ea94a1368dc045469808d30c717aa2b8bb158
--- 1/t/t5100-mailinfo.sh
--- 2/t/t5100-mailinfo.sh
+++ b/t/t5100-mailinfo.sh
@@@ -8,28 -8,49 +8,50 @@@ test_description='git mailinfo and git 
  . ./test-lib.sh
  
  test_expect_success 'split sample box' \
 -      'git mailsplit -o. ../t5100/sample.mbox >last &&
 +      'git mailsplit -o. "$TEST_DIRECTORY"/t5100/sample.mbox >last &&
        last=`cat last` &&
        echo total is $last &&
-       test `cat last` = 11'
+       test `cat last` = 13'
  
  for mail in `echo 00*`
  do
 -      test_expect_success "mailinfo $mail" \
 -              "git mailinfo -u msg$mail patch$mail <$mail >info$mail &&
 +      test_expect_success "mailinfo $mail" '
 +              git mailinfo -u msg$mail patch$mail <$mail >info$mail &&
                echo msg &&
 -              diff ../t5100/msg$mail msg$mail &&
 +              test_cmp "$TEST_DIRECTORY"/t5100/msg$mail msg$mail &&
                echo patch &&
 -              diff ../t5100/patch$mail patch$mail &&
 +              test_cmp "$TEST_DIRECTORY"/t5100/patch$mail patch$mail &&
                echo info &&
 -              diff ../t5100/info$mail info$mail"
 +              test_cmp "$TEST_DIRECTORY"/t5100/info$mail info$mail
 +      '
  done
  
+ 
+ test_expect_success 'split box with rfc2047 samples' \
+       'mkdir rfc2047 &&
+       git mailsplit -orfc2047 "$TEST_DIRECTORY"/t5100/rfc2047-samples.mbox \
+         >rfc2047/last &&
+       last=`cat rfc2047/last` &&
+       echo total is $last &&
+       test `cat rfc2047/last` = 11'
+ 
+ for mail in `echo rfc2047/00*`
+ do
+       test_expect_success "mailinfo $mail" '
+               git mailinfo -u $mail-msg $mail-patch <$mail >$mail-info &&
+               echo msg &&
+               test_cmp "$TEST_DIRECTORY"/t5100/empty $mail-msg &&
+               echo patch &&
+               test_cmp "$TEST_DIRECTORY"/t5100/empty $mail-patch &&
+               echo info &&
+               test_cmp "$TEST_DIRECTORY"/t5100/rfc2047-info-$(basename $mail) $mail-info
+       '
+ done
+ 
  test_expect_success 'respect NULs' '
  
 -      git mailsplit -d3 -o. ../t5100/nul-plain &&
 -      cmp ../t5100/nul-plain 001 &&
 +      git mailsplit -d3 -o. "$TEST_DIRECTORY"/t5100/nul-plain &&
 +      test_cmp "$TEST_DIRECTORY"/t5100/nul-plain 001 &&
        (cat 001 | git mailinfo msg patch) &&
        test 4 = $(wc -l < patch)