pretty: save commit encoding from logmsg_reencode if the caller needs it

The commit encoding is parsed by logmsg_reencode, there's no need for
the caller to re-parse it again. The reencoded message now has the new
encoding, not the original one. The caller would need to read commit
object again before parsing.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/blame.c b/builtin/blame.c
index 86100e96627e4f839fb5b627bc09ed4264c36176..104a948e0c15361a0d62f85328a225d9ad9a0ec4 100644 (file)
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -1425,7 +1425,7 @@ static void get_commit_info(struct commit *commit,
        commit_info_init(ret);
 
        encoding = get_log_output_encoding();
        commit_info_init(ret);
 
        encoding = get_log_output_encoding();

-       message = logmsg_reencode(commit, encoding);
+       message = logmsg_reencode(commit, NULL, encoding);

        get_ac_line(message, "\nauthor ",
                    &ret->author, &ret->author_mail,
                    &ret->author_time, &ret->author_tz);
        get_ac_line(message, "\nauthor ",
                    &ret->author, &ret->author_mail,
                    &ret->author_time, &ret->author_tz);

diff --git a/builtin/commit.c b/builtin/commit.c
index 46204375e786ea583ca1a7eabc3060611adc3d04..d2f30d960a71e41da88d6cc4201cbdca168b8648 100644 (file)
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -955,7 +955,7 @@ static const char *read_commit_message(const char *name)
        if (!commit)
                die(_("could not lookup commit %s"), name);
        out_enc = get_commit_output_encoding();
        if (!commit)
                die(_("could not lookup commit %s"), name);
        out_enc = get_commit_output_encoding();

-       return logmsg_reencode(commit, out_enc);
+       return logmsg_reencode(commit, NULL, out_enc);

 }
 
 static int parse_and_validate_options(int argc, const char *argv[],
 }
 
 static int parse_and_validate_options(int argc, const char *argv[],

diff --git a/commit.h b/commit.h
index 057ff8045efb2cc80f747ee15b2a308a6dead5e5..67bd5091be0b34bfea075cd60281d22cf5b34768 100644 (file)
--- a/commit.h
+++ b/commit.h
@@ -101,6 +101,7 @@ struct userformat_want {
 extern int has_non_ascii(const char *text);
 struct rev_info; /* in revision.h, it circularly uses enum cmit_fmt */
 extern char *logmsg_reencode(const struct commit *commit,
 extern int has_non_ascii(const char *text);
 struct rev_info; /* in revision.h, it circularly uses enum cmit_fmt */
 extern char *logmsg_reencode(const struct commit *commit,

+                            char **commit_encoding,

                             const char *output_encoding);
 extern void logmsg_free(char *msg, const struct commit *commit);
 extern void get_commit_format(const char *arg, struct rev_info *);
                             const char *output_encoding);
 extern void logmsg_free(char *msg, const struct commit *commit);
 extern void get_commit_format(const char *arg, struct rev_info *);

diff --git a/pretty.c b/pretty.c
index d3a82d22d398ae7234f8917f4d8b0770ba4d0c47..c361b9bc204dd8f232167144906853c5694658f8 100644 (file)
--- a/pretty.c
+++ b/pretty.c
@@ -594,6 +594,7 @@ static char *replace_encoding_header(char *buf, const char *encoding)
 }
 
 char *logmsg_reencode(const struct commit *commit,
 }
 
 char *logmsg_reencode(const struct commit *commit,

+                     char **commit_encoding,

                      const char *output_encoding)
 {
        static const char *utf8 = "UTF-8";
                      const char *output_encoding)
 {
        static const char *utf8 = "UTF-8";


@@ -615,9 +616,15 @@ char *logmsg_reencode(const struct commit *commit,
                            sha1_to_hex(commit->object.sha1), typename(type));
        }
 
                            sha1_to_hex(commit->object.sha1), typename(type));
        }
 

-       if (!output_encoding || !*output_encoding)
+       if (!output_encoding || !*output_encoding) {
+               if (commit_encoding)
+                       *commit_encoding =
+                               get_header(commit, msg, "encoding");

                return msg;
                return msg;

+       }

        encoding = get_header(commit, msg, "encoding");
        encoding = get_header(commit, msg, "encoding");

+       if (commit_encoding)
+               *commit_encoding = encoding;

        use_encoding = encoding ? encoding : utf8;
        if (same_encoding(use_encoding, output_encoding)) {
                /*
        use_encoding = encoding ? encoding : utf8;
        if (same_encoding(use_encoding, output_encoding)) {
                /*


@@ -658,7 +665,8 @@ char *logmsg_reencode(const struct commit *commit,
        if (out)
                out = replace_encoding_header(out, output_encoding);
 
        if (out)
                out = replace_encoding_header(out, output_encoding);
 

-       free(encoding);
+       if (!commit_encoding)
+               free(encoding);

        /*
         * If the re-encoding failed, out might be NULL here; in that
         * case we just return the commit message verbatim.
        /*
         * If the re-encoding failed, out might be NULL here; in that
         * case we just return the commit message verbatim.


@@ -1288,7 +1296,7 @@ void format_commit_message(const struct commit *commit,
        context.commit = commit;
        context.pretty_ctx = pretty_ctx;
        context.wrap_start = sb->len;
        context.commit = commit;
        context.pretty_ctx = pretty_ctx;
        context.wrap_start = sb->len;

-       context.message = logmsg_reencode(commit, output_enc);
+       context.message = logmsg_reencode(commit, NULL, output_enc);

 
        strbuf_expand(sb, format, format_commit_item, &context);
        rewrap_message_tail(sb, &context, 0, 0, 0);
 
        strbuf_expand(sb, format, format_commit_item, &context);
        rewrap_message_tail(sb, &context, 0, 0, 0);


@@ -1451,7 +1459,7 @@ void pretty_print_commit(const struct pretty_print_context *pp,
        }
 
        encoding = get_log_output_encoding();
        }
 
        encoding = get_log_output_encoding();

-       msg = reencoded = logmsg_reencode(commit, encoding);
+       msg = reencoded = logmsg_reencode(commit, NULL, encoding);

 
        if (pp->fmt == CMIT_FMT_ONELINE || pp->fmt == CMIT_FMT_EMAIL)
                indent = 0;
 
        if (pp->fmt == CMIT_FMT_ONELINE || pp->fmt == CMIT_FMT_EMAIL)
                indent = 0;

diff --git a/revision.c b/revision.c
index eb981288686a2c7cd8c854e3f414b606ed4f8c69..d739211f9be0375deb3dbab81d9c0391916dfd65 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -2291,7 +2291,7 @@ static int commit_match(struct commit *commit, struct rev_info *opt)
         * in it.
         */
        encoding = get_log_output_encoding();
         * in it.
         */
        encoding = get_log_output_encoding();

-       message = logmsg_reencode(commit, encoding);
+       message = logmsg_reencode(commit, NULL, encoding);

 
        /* Copy the commit to temporary if we are using "fake" headers */
        if (buf.len)
 
        /* Copy the commit to temporary if we are using "fake" headers */
        if (buf.len)