diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-09-29 22:30:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-29 22:30:48 -0700 |
| commit | 52938b113b4dd09bae869326d4993a7b998e6877 (patch) | |
| tree | 717e0d86b8a0d24f95b8fd3f3672d321917c4856 | |
| parent | 666ca59a8c88e1750386fa64c7ed4be698fd1b2a (diff) | |
| parent | 176943b9658b1fa9ae3972156100d831d19c3576 (diff) | |
| download | git-52938b113b4dd09bae869326d4993a7b998e6877.tar.gz | |
Merge branch 'jc/maint-mailinfo-mime-attr' into maint
* jc/maint-mailinfo-mime-attr:
mailinfo: do not concatenate charset= attribute values from mime headers
| -rw-r--r-- | builtin/mailinfo.c | 5 | ||||
| -rwxr-xr-x | t/t5100-mailinfo.sh | 2 | ||||
| -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 |
6 files changed, 32 insertions, 4 deletions
diff --git a/builtin/mailinfo.c b/builtin/mailinfo.c index 18895ee4d9..9973bd9099 100644 --- a/builtin/mailinfo.c +++ b/builtin/mailinfo.c @@ -160,10 +160,9 @@ static int slurp_attr(const char *line, const char *name, struct strbuf *attr) const char *ends, *ap = strcasestr(line, name); size_t sz; - if (!ap) { - strbuf_setlen(attr, 0); + strbuf_setlen(attr, 0); + if (!ap) return 0; - } ap += strlen(name); if (*ap == '"') { ap++; 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 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 |