global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-19 21:20:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'nd/pretty-commit-log-message' into next

Browse Source 
* nd/pretty-commit-log-message:
  pretty.c: use original commit message if reencoding fails
  pretty.c: free get_header() return value
This commit is contained in:
Junio C Hamano
2011-10-27 15:40:34 -07:00
parent ff73a2ef01 1d5bd615c0
commit 4b61df7412
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pretty.c
View File

@@ -1178,7 +1178,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));
@@ -1187,10 +1186,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);