t6010-merge-base.sh: Depict the octopus test graph

diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c
index fb5ad70f3fddeb560fbd045e1112a0bc739b6c9e..92637ac0bae82d0b88e267b572a51a75299cda5c 100644 (file)
--- a/builtin-mailinfo.c
+++ b/builtin-mailinfo.c
@@ -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':
@@ -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