Use 'UTF-8' rather than 'utf-8' everywhere for backward compatibility

Some ancient platforms (Solaris 7, IRIX 6.5) do not understand 'utf-8', but
all tested implementations understand 'UTF-8'.

Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin-log.c b/builtin-log.c
index 5eaec5d24e6ca70af2879ce9439eb2ba831211b6..58db9592c93070176273ff8c843f382b30174a32 100644 (file)
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -619,7 +619,7 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout,
        struct shortlog log;
        struct strbuf sb = STRBUF_INIT;
        int i;
        struct shortlog log;
        struct strbuf sb = STRBUF_INIT;
        int i;

-       const char *encoding = "utf-8";
+       const char *encoding = "UTF-8";

        struct diff_options opts;
        int need_8bit_cte = 0;
        struct commit *commit = NULL;
        struct diff_options opts;
        int need_8bit_cte = 0;
        struct commit *commit = NULL;

diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c
index 1eeeb4de6d0d54e3fd753b7f057351094e10a24e..5ebc8b53cc820933d5098cbbfc77ff49c18b6b85 100644 (file)
--- a/builtin-mailinfo.c
+++ b/builtin-mailinfo.c
@@ -944,7 +944,7 @@ int cmd_mailinfo(int argc, const char **argv, const char *prefix)
         */
        git_config(git_default_config, NULL);
 
         */
        git_config(git_default_config, NULL);
 

-       def_charset = (git_commit_encoding ? git_commit_encoding : "utf-8");
+       def_charset = (git_commit_encoding ? git_commit_encoding : "UTF-8");

        metainfo_charset = def_charset;
 
        while (1 < argc && argv[1][0] == '-') {
        metainfo_charset = def_charset;
 
        while (1 < argc && argv[1][0] == '-') {

diff --git a/builtin-revert.c b/builtin-revert.c
index 3f2614e1bbef009afadefff7d284225533db2a09..ae0139500a6b4226e8b38b580524c6273f69a8cb 100644 (file)
--- a/builtin-revert.c
+++ b/builtin-revert.c
@@ -323,9 +323,9 @@ static int revert_or_cherry_pick(int argc, const char **argv)
 
        encoding = get_encoding(message);
        if (!encoding)
 
        encoding = get_encoding(message);
        if (!encoding)

-               encoding = "utf-8";
+               encoding = "UTF-8";

        if (!git_commit_encoding)
        if (!git_commit_encoding)

-               git_commit_encoding = "utf-8";
+               git_commit_encoding = "UTF-8";

        if ((reencoded_message = reencode_string(message,
                                        git_commit_encoding, encoding)))
                message = reencoded_message;
        if ((reencoded_message = reencode_string(message,
                                        git_commit_encoding, encoding)))
                message = reencoded_message;

diff --git a/pretty.c b/pretty.c
index a0ef356558f4cdb148010f1b47dbd3fcc363d8ba..e5328dab5b2978d90d20f47ed799782e7b2fb63b 100644 (file)
--- a/pretty.c
+++ b/pretty.c
@@ -284,7 +284,7 @@ static char *replace_encoding_header(char *buf, const char *encoding)
 static char *logmsg_reencode(const struct commit *commit,
                             const char *output_encoding)
 {
 static char *logmsg_reencode(const struct commit *commit,
                             const char *output_encoding)
 {

-       static const char *utf8 = "utf-8";
+       static const char *utf8 = "UTF-8";

        const char *use_encoding;
        char *encoding;
        char *out;
        const char *use_encoding;
        char *encoding;
        char *out;


@@ -881,7 +881,7 @@ char *reencode_commit_message(const struct commit *commit, const char **encoding
                    ? git_log_output_encoding
                    : git_commit_encoding);
        if (!encoding)
                    ? git_log_output_encoding
                    : git_commit_encoding);
        if (!encoding)

-               encoding = "utf-8";
+               encoding = "UTF-8";

        if (encoding_p)
                *encoding_p = encoding;
        return logmsg_reencode(commit, encoding);
        if (encoding_p)
                *encoding_p = encoding;
        return logmsg_reencode(commit, encoding);