Junio C Hamano  committed 4525e8e

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.

  • Participants
  • Parent commits 05c1da2
  • Branches master
  • Tags v1.6.4-rc1

Comments (0)

Files changed (3)

File builtin-mailinfo.c

 	char *pos;
 	size_t remove;
-	int brackets_removed = 0;
 	while (subject->len) {
 		switch (*subject->buf) {
 		case 'r': case 'R':
 			strbuf_remove(subject, 0, 1);
 		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;
 			} else

File t/t5100/info0012

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

File t/t5100/sample.mbox

 Content-Type: text/plain;
 Content-Transfer-Encoding: 8bit
-Subject: [PATCH] [Navy-patches]
+Subject: [Navy-patches] [PATCH]