Merge branch 'jc/git-open-cloexec'

diff --git a/utf8.c b/utf8.c
index 550e785ecbf0584cb959050a24fcce58905cff3b..0c8e011a58cae3c683851007ec81828ad8284471 100644 (file)
--- 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;
 }