X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=pretty.c;h=230fe1cc82e3a3bf7c0fef604350868d917acef4;hb=b1bcfbe34439ff6d1a04d0bddb01eebe4df418a5;hp=f45eb54e4c99b8d67e4aa85f9a6218ea7a560592;hpb=aface4c3904de688ced9cecad4ac07bc3afeec8f;p=git.git

diff --git a/pretty.c b/pretty.c
index f45eb54e4..230fe1cc8 100644
--- a/pretty.c
+++ b/pretty.c
@@ -1094,7 +1094,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));
@@ -1103,10 +1102,13 @@ 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);
+			if (!context.message)
+				context.message = commit->buffer;
+		}
+		free(enc);
 	}
 
 	strbuf_expand(sb, format, format_commit_item, &context);