kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'ae/maint-mailinfo-rm-only-one-patch-marker' 

* ae/maint-mailinfo-rm-only-one-patch-marker:
  mailinfo: Remove only one set of square brackets
maint
Junio C Hamano 2009-07-10 20:18:09 -07:00
parent 6edd14968b 650d30d8a1
commit 73ccb916e4
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
builtin-mailinfo.c
View File

@ -221,6 +221,8 @@ static void cleanup_subject(struct strbuf *subject)
{ {
char *pos; char *pos;
size_t remove; size_t remove;
int brackets_removed = 0;

while (subject->len) { while (subject->len) {
switch (*subject->buf) { switch (*subject->buf) {
case 'r': case 'R': case 'r': case 'R':
@ -235,10 +237,15 @@ static void cleanup_subject(struct strbuf *subject)
strbuf_remove(subject, 0, 1); strbuf_remove(subject, 0, 1);
continue; continue;
case '[': case '[':
/* remove only one set of square brackets */
if (brackets_removed)
break;

if ((pos = strchr(subject->buf, ']'))) { if ((pos = strchr(subject->buf, ']'))) {
remove = pos - subject->buf; remove = pos - subject->buf;
if (remove <= (subject->len - remove) * 2) { if (remove <= (subject->len - remove) * 2) {
strbuf_remove(subject, 0, remove + 1); strbuf_remove(subject, 0, remove + 1);
brackets_removed = 1;
continue; continue;
} }
} else } else

2
t/t5100/info0012
View File

@ -1,5 +1,5 @@
Author: Dmitriy Blinov Author: Dmitriy Blinov
Email: bda@mnsspb.ru Email: bda@mnsspb.ru
Subject: Изменён список пакетов необходимых для сборки Subject: [Navy-patches] Изменён список пакетов необходимых для сборки
Date: Wed, 12 Nov 2008 17:54:41 +0300 Date: Wed, 12 Nov 2008 17:54:41 +0300



2
t/t5100/sample.mbox
View File

@ -514,7 +514,7 @@ MIME-Version: 1.0
Content-Type: text/plain; Content-Type: text/plain;
charset=utf-8 charset=utf-8
Content-Transfer-Encoding: 8bit Content-Transfer-Encoding: 8bit
Subject: [Navy-patches] [PATCH] Subject: [PATCH] [Navy-patches]
=?utf-8?b?0JjQt9C80LXQvdGR0L0g0YHQv9C40YHQvtC6INC/0LA=?= =?utf-8?b?0JjQt9C80LXQvdGR0L0g0YHQv9C40YHQvtC6INC/0LA=?=
=?utf-8?b?0LrQtdGC0L7QsiDQvdC10L7QsdGF0L7QtNC40LzRi9GFINC00LvRjyA=?= =?utf-8?b?0LrQtdGC0L7QsiDQvdC10L7QsdGF0L7QtNC40LzRi9GFINC00LvRjyA=?=
=?utf-8?b?0YHQsdC+0YDQutC4?= =?utf-8?b?0YHQsdC+0YDQutC4?=