Skip to content

Commit

Permalink
Revert "mailinfo: Remove only one set of square brackets"
Browse files Browse the repository at this point in the history
This reverts commit 650d30d.

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.
  • Loading branch information
Junio C Hamano committed Jul 15, 2009
1 parent 05c1da2 commit 4525e8e
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 9 deletions.
7 changes: 0 additions & 7 deletions builtin-mailinfo.c
Original file line number Diff line number Diff line change
Expand Up @@ -221,8 +221,6 @@ static void cleanup_subject(struct strbuf *subject)
{
char *pos;
size_t remove;
int brackets_removed = 0;

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

if ((pos = strchr(subject->buf, ']'))) {
remove = pos - subject->buf;
if (remove <= (subject->len - remove) * 2) {
strbuf_remove(subject, 0, remove + 1);
brackets_removed = 1;
continue;
}
} else
Expand Down
2 changes: 1 addition & 1 deletion t/t5100/info0012
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Author: Dmitriy Blinov
Email: bda@mnsspb.ru
Subject: [Navy-patches] Изменён список пакетов необходимых для сборки
Subject: Изменён список пакетов необходимых для сборки
Date: Wed, 12 Nov 2008 17:54:41 +0300

2 changes: 1 addition & 1 deletion t/t5100/sample.mbox
Original file line number Diff line number Diff line change
Expand Up @@ -514,7 +514,7 @@ MIME-Version: 1.0
Content-Type: text/plain;
charset=utf-8
Content-Transfer-Encoding: 8bit
Subject: [PATCH] [Navy-patches]
Subject: [Navy-patches] [PATCH]
=?utf-8?b?0JjQt9C80LXQvdGR0L0g0YHQv9C40YHQvtC6INC/0LA=?=
=?utf-8?b?0LrQtdGC0L7QsiDQvdC10L7QsdGF0L7QtNC40LzRi9GFINC00LvRjyA=?=
=?utf-8?b?0YHQsdC+0YDQutC4?=
Expand Down

0 comments on commit 4525e8e

Please sign in to comment.