summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-10-17 17:12:55 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-10-17 22:42:40 -0700
commite297cf5aff0264c16b6c325c0beab71bc04cd496 (patch)
tree66de5f62e9b60fab2b3fe7ef1e3c230365134894 /builtin
parentGit 1.8.0-rc3 (diff)
downloadtgif-e297cf5aff0264c16b6c325c0beab71bc04cd496.tar.xz
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>
Diffstat (limited to 'builtin')
-rw-r--r--builtin/blame.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/builtin/blame.c b/builtin/blame.c
index c27ef21c23..cfae569905 100644
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -1425,7 +1425,7 @@ static void get_commit_info(struct commit *commit,
int detailed)
{
int len;
- const char *subject;
+ const char *subject, *encoding;
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));
}
- 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;