From 353aaf2fa136d34db64d1e4af12cc12431466a9e Mon Sep 17 00:00:00 2001 From: Kirill Smelkov Date: Thu, 8 Jan 2009 01:43:42 +0300 Subject: mailinfo: correctly handle multiline 'Subject:' header MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When native language (RU) is in use, subject header usually contains several parts, e.g. Subject: [Navy-patches] [PATCH] =?utf-8?b?0JjQt9C80LXQvdGR0L0g0YHQv9C40YHQvtC6INC/0LA=?= =?utf-8?b?0LrQtdGC0L7QsiDQvdC10L7QsdGF0L7QtNC40LzRi9GFINC00LvRjyA=?= =?utf-8?b?0YHQsdC+0YDQutC4?= This exposes several bugs in builtin-mailinfo.c: 1. decode_b_segment: do not append explicit NUL -- explicit NUL was preventing correct header construction on parts concatenation via strbuf_addbuf in decode_header_bq. Fixes: -Subject: Изменён список пакетов необходимых для сборки +Subject: Изменён список па Then 2. Do not emit '\n' between "encoded-word" where RFC2046 says that linear white space between them are ignored when displaying. Fixes: -Subject: Изменён список пакетов необходимых для сборки +Subject: Изменён список па кетов необходимых для сборки Signed-off-by: Kirill Smelkov Signed-off-by: Junio C Hamano --- t/t5100/info0012 | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 t/t5100/info0012 (limited to 't/t5100/info0012') diff --git a/t/t5100/info0012 b/t/t5100/info0012 new file mode 100644 index 0000000000..ac1216ff75 --- /dev/null +++ b/t/t5100/info0012 @@ -0,0 +1,5 @@ +Author: Dmitriy Blinov +Email: bda@mnsspb.ru +Subject: Изменён список пакетов необходимых для сборки +Date: Wed, 12 Nov 2008 17:54:41 +0300 + -- cgit v1.2.3 From 650d30d8a120c8982309ccb9ef40432b4ea2eb74 Mon Sep 17 00:00:00 2001 From: Andreas Ericsson Date: Mon, 29 Jun 2009 11:55:51 +0200 Subject: mailinfo: Remove only one set of square brackets git-format-patch prepends patches with a [PATCH x/n] prefix, but mailinfo used to remove any number of square-bracket pairs and the content between them. This prevents one from using a commit subject like this: [ and ] must be allowed as input Removing the square bracket pair from this rather clumsily constructed subject line loses important information, so we must take care not to. This patch causes the subject stripping to stop after it has encountered one pair of square brackets. One possible downside of this patch is that the patch-handling programs will now fail at removing author-added square-brackets to be removed, such as [RFC][PATCH x/n] However, since format-patch only adds one set of square brackets, this behaviour is quite easily undesrstood and defended while the previous behaviour is not. Signed-off-by: Andreas Ericsson Signed-off-by: Junio C Hamano --- t/t5100/info0012 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 't/t5100/info0012') diff --git a/t/t5100/info0012 b/t/t5100/info0012 index ac1216ff75..9cd1415d25 100644 --- a/t/t5100/info0012 +++ b/t/t5100/info0012 @@ -1,5 +1,5 @@ Author: Dmitriy Blinov Email: bda@mnsspb.ru -Subject: Изменён список пакетов необходимых для сборки +Subject: [Navy-patches] Изменён список пакетов необходимых для сборки Date: Wed, 12 Nov 2008 17:54:41 +0300 -- cgit v1.2.3 From 4525e8e41a8c0c4246a95097744604ea72198dad Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 15 Jul 2009 15:10:06 -0700 Subject: Revert "mailinfo: Remove only one set of square brackets" This reverts commit 650d30d8a120c8982309ccb9ef40432b4ea2eb74. Some mailing lists are configured add prefix "[listname] " to all their messages, and also people hand-edit subject lines, be it an output from format-patch or a patch generated by some other means. We cannot stop people from mucking with the subject line, and with the change, there always will be need for hand editing the subject when that happens. People have depended on the leading [bracketed string] removal. --- t/t5100/info0012 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 't/t5100/info0012') diff --git a/t/t5100/info0012 b/t/t5100/info0012 index 9cd1415d25..ac1216ff75 100644 --- a/t/t5100/info0012 +++ b/t/t5100/info0012 @@ -1,5 +1,5 @@ Author: Dmitriy Blinov Email: bda@mnsspb.ru -Subject: [Navy-patches] Изменён список пакетов необходимых для сборки +Subject: Изменён список пакетов необходимых для сборки Date: Wed, 12 Nov 2008 17:54:41 +0300 -- cgit v1.2.3