diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-09-29 16:57:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-09-29 16:57:12 -0700 |
| commit | 4cff50b3fb50940e57dc10769b2f92d5cec1a05a (patch) | |
| tree | 94ff1cf727557623e3b68fb4b3efbfce4e1e2766 /t/t5100-mailinfo.sh | |
| parent | Fifth batch for 2.11 (diff) | |
| parent | mailinfo: handle in-body header continuations (diff) | |
| download | tgif-4cff50b3fb50940e57dc10769b2f92d5cec1a05a.tar.xz | |
Merge branch 'jt/mailinfo-fold-in-body-headers'
When "git format-patch --stdout" output is placed as an in-body
header and it uses the RFC2822 header folding, "git am" failed to
put the header line back into a single logical line. The
underlying "git mailinfo" was taught to handle this properly.
* jt/mailinfo-fold-in-body-headers:
mailinfo: handle in-body header continuations
mailinfo: make is_scissors_line take plain char *
mailinfo: separate in-body header processing
Diffstat (limited to 't/t5100-mailinfo.sh')
| -rwxr-xr-x | t/t5100-mailinfo.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t5100-mailinfo.sh b/t/t5100-mailinfo.sh index 1a5a546230..e173c33f4b 100755 --- 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) = 17' + test $(cat last) = 18' check_mailinfo () { mail=$1 opt=$2 |