Skip to content

Commit

Permalink
pretty.c: free get_header() return value
Browse files Browse the repository at this point in the history
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Nguyễn Thái Ngọc Duy authored and Junio C Hamano committed Oct 24, 2011
1 parent 7ed863a commit 9cd7a92
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions pretty.c
Original file line number Diff line number Diff line change
Expand Up @@ -1013,7 +1013,6 @@ void format_commit_message(const struct commit *commit,
{
struct format_commit_context context;
static const char utf8[] = "UTF-8";
const char *enc;
const char *output_enc = pretty_ctx->output_encoding;

memset(&context, 0, sizeof(context));
Expand All @@ -1022,10 +1021,10 @@ void format_commit_message(const struct commit *commit,
context.wrap_start = sb->len;
context.message = commit->buffer;
if (output_enc) {
enc = get_header(commit, "encoding");
enc = enc ? enc : utf8;
if (strcmp(enc, output_enc))
char *enc = get_header(commit, "encoding");
if (strcmp(enc ? enc : utf8, output_enc))
context.message = logmsg_reencode(commit, output_enc);
free(enc);
}

strbuf_expand(sb, format, format_commit_item, &context);
Expand Down

0 comments on commit 9cd7a92

Please sign in to comment.