From: Nguyễn Thái Ngọc Duy Date: Sun, 23 Oct 2011 11:51:35 GMT Subject: [PATCH 2/2] pretty.c: use original commit message if reencoding fails Message-ID: <1319370695-12638-2-git-send-email-pclouds@gmail.com> In-Reply-To: <1319370695-12638-1-git-send-email-pclouds@gmail.com> Signed-off-by: Nguyễn Thái Ngọc Duy --- pretty.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/pretty.c b/pretty.c index 375ff7b..230fe1c 100644 --- a/pretty.c +++ b/pretty.c @@ -1103,8 +1103,11 @@ void format_commit_message(const struct commit *commit, context.message = commit->buffer; if (output_enc) { char *enc = get_header(commit, "encoding"); - if (strcmp(enc ? enc : utf8, output_enc)) + if (strcmp(enc ? enc : utf8, output_enc)) { context.message = logmsg_reencode(commit, output_enc); + if (!context.message) + context.message = commit->buffer; + } free(enc); } -- 1.7.3.1.256.g2539c.dirty