diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-12-07 14:10:56 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-12-07 14:10:56 -0800 |
| commit | fff26a68053022a2cbc39142c7c6f6d016837058 (patch) | |
| tree | 1ad5a3cd1a135213b3694f11fdcb52bcddec51b9 /builtin | |
| parent | 6a402843c2bc0a72fb70c8795aee523d7f1582d3 (diff) | |
| parent | 0e18bcd5e937b9e5857892e7f5c80c3c5b1da5d4 (diff) | |
| download | git-fff26a68053022a2cbc39142c7c6f6d016837058.tar.gz git-fff26a68053022a2cbc39142c7c6f6d016837058.tar.xz | |
Merge branch 'jc/same-encoding' into maint
Various codepaths checked if two encoding names are the same using
ad-hoc code and some of them ended up asking iconv() to convert
between "utf8" and "UTF-8". The former is not a valid way to spell
the encoding name, but often people use it by mistake, and we
equated them in some but not all codepaths. Introduce a new helper
function to make these codepaths consistent.
* jc/same-encoding:
reencode_string(): introduce and use same_encoding()
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/mailinfo.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/mailinfo.c b/builtin/mailinfo.c index da231400b..24a772d8e 100644 --- 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) |