Merge branch 'jc/maint-mailinfo-mime-attr' into maint

diff --git a/builtin/mailinfo.c b/builtin/mailinfo.c
index dd8b67cfaafb15272d424fb01ead8b51276ec957..9973bd9099c7b65ad2ce56bb1b1b806279b0beab 100644 (file)
--- a/builtin/mailinfo.c
+++ b/builtin/mailinfo.c
@@ -231,7 +231,9 @@ static void cleanup_subject(struct strbuf *subject)
                case 'r': case 'R':
                        if (subject->len <= at + 3)
                                break;
-                       if (!memcmp(subject->buf + at + 1, "e:", 2)) {
+                       if ((subject->buf[at + 1] == 'e' ||
+                            subject->buf[at + 1] == 'E') &&
+                           subject->buf[at + 2] == ':') {
                                strbuf_remove(subject, at, 3);
                                continue;
                        }