Merge branch 'yd/use-test-config-unconfig'

diff --git a/builtin/mailinfo.c b/builtin/mailinfo.c
index da231400b327b86a18a054075f6aee4749846932..24a772d8e1b7355a58088d784fdc18cd54302b7d 100644 (file)
--- a/builtin/mailinfo.c
+++ b/builtin/mailinfo.c
@@ -483,7 +483,8 @@ static void convert_to_utf8(struct strbuf *line, const char *charset)
 
        if (!charset || !*charset)
                return;
-       if (!strcasecmp(metainfo_charset, charset))
+
+       if (same_encoding(metainfo_charset, charset))
                return;
        out = reencode_string(line->buf, metainfo_charset, charset);
        if (!out)