summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-09-26 18:09:48 -0700
committerJunio C Hamano <gitster@pobox.com>2016-09-26 18:16:23 -0700
commitdf3755888b9a54e69ab70881738d431587c57951 (patch)
treeb1acb494456ae833f05aab6b9c51461434688729
parent3270741ea8c2a225183d272bf19ea19d5b3c05d8 (diff)
downloadgit-jc/latin-1.tar.gz
utf8: accept "latin-1" as ISO-8859-1jc/latin-1
Even though latin-1 is still seen in e-mail headers, some platforms only install ISO-8859-1. "iconv -f ISO-8859-1" succeeds, while "iconv -f latin-1" fails on such a system. Using the same fallback_encoding() mechanism factored out in the previous step, teach ourselves that "ISO-8859-1" has a better chance of being accepted than "latin-1". Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--utf8.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/utf8.c b/utf8.c
index 550e785ecb..0c8e011a58 100644
--- a/utf8.c
+++ b/utf8.c
@@ -501,6 +501,13 @@ static const char *fallback_encoding(const char *name)
if (is_encoding_utf8(name))
return "UTF-8";
+ /*
+ * Even though latin-1 is still seen in e-mail
+ * headers, some platforms only install ISO-8859-1.
+ */
+ if (!strcasecmp(name, "latin-1"))
+ return "ISO-8859-1";
+
return name;
}