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 | |
| parent | Merge branch 'po/maint-docs' (diff) | |
| parent | mailinfo: do not concatenate charset= attribute values from mime headers (diff) | |
| download | tgif-b1bb02dede05e26ae39908ae4ad35f011583bd50.tar.xz | |
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')
| -rw-r--r-- | t/t5100/info0017 | 5 | ||||
| -rw-r--r-- | t/t5100/msg0017 | 2 | ||||
| -rw-r--r-- | t/t5100/patch0017 | 6 | ||||
| -rw-r--r-- | t/t5100/sample.mbox | 16 |
4 files changed, 29 insertions, 0 deletions
diff --git a/t/t5100/info0017 b/t/t5100/info0017 new file mode 100644 index 0000000000..d2bc89ffe9 --- /dev/null +++ b/t/t5100/info0017 @@ -0,0 +1,5 @@ +Author: A U Thor +Email: a.u.thor@example.com +Subject: A E I O U +Date: Mon, 17 Sep 2012 14:23:44 -0700 + diff --git a/t/t5100/msg0017 b/t/t5100/msg0017 new file mode 100644 index 0000000000..2ee0900850 --- /dev/null +++ b/t/t5100/msg0017 @@ -0,0 +1,2 @@ +New content here + diff --git a/t/t5100/patch0017 b/t/t5100/patch0017 new file mode 100644 index 0000000000..35cf84c9a1 --- /dev/null +++ b/t/t5100/patch0017 @@ -0,0 +1,6 @@ +diff --git a/foo b/foo +index e69de29..d95f3ad 100644 +--- a/foo ++++ b/foo +@@ -0,0 +1 @@ ++New content diff --git a/t/t5100/sample.mbox b/t/t5100/sample.mbox index 34a09a0fc1..8b2ae064c3 100644 --- a/t/t5100/sample.mbox +++ b/t/t5100/sample.mbox @@ -683,3 +683,19 @@ index e69de29..d95f3ad 100644 @@ -0,0 +1 @@ +content +From nobody Mon Sep 17 00:00:00 2001 +From: A U Thor <a.u.thor@example.com> +Subject: A E I O U +Date: Mon, 17 Sep 2012 14:23:44 -0700 +MIME-Version: 1.0 +Content-Type: text/plain; charset="iso-2022-jp" +Content-type: text/plain; charset="UTF-8" + +New content here + +diff --git a/foo b/foo +index e69de29..d95f3ad 100644 +--- a/foo ++++ b/foo +@@ -0,0 +1 @@ ++New content |