diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-09-25 10:39:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-25 10:39:56 -0700 |
| commit | b1bb02dede05e26ae39908ae4ad35f011583bd50 (patch) | |
| tree | a804bdd9651232b18c056e7217557bd21cd9f6b0 /t/t5100-mailinfo.sh | |
| parent | ff91dbbf7d8ed9d1f67fe69e62fd883194916b07 (diff) | |
| parent | 176943b9658b1fa9ae3972156100d831d19c3576 (diff) | |
| download | git-b1bb02dede05e26ae39908ae4ad35f011583bd50.tar.gz | |
Merge branch 'jc/maint-mailinfo-mime-attr'
When "git am" is fed an input that has multiple "Content-type: ..."
header, it did not grok charset= attribute correctly.
* jc/maint-mailinfo-mime-attr:
mailinfo: do not concatenate charset= attribute values from mime headers
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 81904d9ec8..3e64a7a65d 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` = 16' + test `cat last` = 17' check_mailinfo () { mail=$1 opt=$2 |