mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pretty.c: use original commit message if reencoding fails

Browse Source 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy
2011-10-23 22:51:35 +11:00
committed by Junio C Hamano
parent 9cd7a92b97
commit 1d5bd615c0
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pretty.c
View File

@ -1022,8 +1022,11 @@ void format_commit_message(const struct commit *commit,
context.message = commit->buffer; context.message = commit->buffer;
if (output_enc) { if (output_enc) {
char *enc = get_header(commit, "encoding"); 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); context.message = logmsg_reencode(commit, output_enc);
if (!context.message)
context.message = commit->buffer;
}
free(enc); free(enc);
} }