pretty: remove reencode_commit_message()

This function has only two callsites, and is a thin wrapper whose
usefulness is dubious.  When the caller needs to learn the log
output encoding, it should be able to do so by directly calling
get_log_output_encoding() and calling the underlying
logmsg_reencode() with it.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/blame.c b/builtin/blame.c
index c27ef21c2326afd29a68146d23c734c7ea708556..cfae5699051312943d90212fc9cbfda2aafb2288 100644 (file)
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -1425,7 +1425,7 @@ static void get_commit_info(struct commit *commit,
                            int detailed)
 {
        int len;
                            int detailed)
 {
        int len;

-       const char *subject;
+       const char *subject, *encoding;

        char *reencoded, *message;
        static char author_name[1024];
        static char author_mail[1024];
        char *reencoded, *message;
        static char author_name[1024];
        static char author_mail[1024];


@@ -1446,7 +1446,8 @@ static void get_commit_info(struct commit *commit,
                        die("Cannot read commit %s",
                            sha1_to_hex(commit->object.sha1));
        }
                        die("Cannot read commit %s",
                            sha1_to_hex(commit->object.sha1));
        }

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

        message   = reencoded ? reencoded : commit->buffer;
        ret->author = author_name;
        ret->author_mail = author_mail;
        message   = reencoded ? reencoded : commit->buffer;
        ret->author = author_name;
        ret->author_mail = author_mail;

diff --git a/commit.h b/commit.h
index 9f2131318d4c43fdaaca40e45e45e7d1af61cdfe..a822af8c8d6cc7a190acc666391c4636d10f497c 100644 (file)
--- a/commit.h
+++ b/commit.h
@@ -99,8 +99,6 @@ 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,
                             const char *output_encoding);
 struct rev_info; /* in revision.h, it circularly uses enum cmit_fmt */
 extern char *logmsg_reencode(const struct commit *commit,
                             const char *output_encoding);

-extern char *reencode_commit_message(const struct commit *commit,
-                                    const char **encoding_p);

 extern void get_commit_format(const char *arg, struct rev_info *);
 extern const char *format_subject(struct strbuf *sb, const char *msg,
                                  const char *line_separator);
 extern void get_commit_format(const char *arg, struct rev_info *);
 extern const char *format_subject(struct strbuf *sb, const char *msg,
                                  const char *line_separator);

diff --git a/pretty.c b/pretty.c
index 8b1ea9ffad2a0b5c5cb5c15cc5057a8a7132da07..c311a68fc4d4bd8e5859dde7a8b5e02b04d27879 100644 (file)
--- a/pretty.c
+++ b/pretty.c
@@ -1341,16 +1341,6 @@ void pp_remainder(const struct pretty_print_context *pp,
        }
 }
 
        }
 }
 

-char *reencode_commit_message(const struct commit *commit, const char **encoding_p)
-{
-       const char *encoding;
-
-       encoding = get_log_output_encoding();
-       if (encoding_p)
-               *encoding_p = encoding;
-       return logmsg_reencode(commit, encoding);
-}
-

 void pretty_print_commit(const struct pretty_print_context *pp,
                         const struct commit *commit,
                         struct strbuf *sb)
 void pretty_print_commit(const struct pretty_print_context *pp,
                         const struct commit *commit,
                         struct strbuf *sb)


@@ -1367,7 +1357,8 @@ void pretty_print_commit(const struct pretty_print_context *pp,
                return;
        }
 
                return;
        }
 

-       reencoded = reencode_commit_message(commit, &encoding);
+       encoding = get_log_output_encoding();
+       reencoded = logmsg_reencode(commit, encoding);

        if (reencoded) {
                msg = reencoded;
        }
        if (reencoded) {
                msg = reencoded;
        }