global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-14 02:43:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jc/utf8' into next

Browse Source 
* jc/utf8:
  UTF-8: introduce i18n.logoutputencoding.
This commit is contained in:
Junio C Hamano
2006-12-27 16:44:51 -08:00
parent 753ab8f67c d2c11a38c4
commit 00a0d14c13
15 changed files with 160 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
commit.c
View File

@@ -626,12 +626,20 @@ static char *get_header(const struct commit *commit, const char *key)
static char *logmsg_reencode(const struct commit *commit)
{
char *encoding = get_header(commit, "encoding");
char *encoding;
char *out;
char *output_encoding = (git_log_output_encoding
? git_log_output_encoding
: git_commit_encoding);
if (!encoding || !strcmp(encoding, git_commit_encoding))
if (!output_encoding)
return NULL;
out = reencode_string(commit->buffer, git_commit_encoding, encoding);
encoding = get_header(commit, "encoding");
if (!encoding || !strcmp(encoding, output_encoding)) {
free(encoding);
return NULL;
}
out = reencode_string(commit->buffer, output_encoding, encoding);
free(encoding);
if (!out)
return NULL;
@@ -652,15 +660,10 @@ unsigned long pretty_print_commit(enum cmit_fmt fmt,
int parents_shown = 0;
const char *msg = commit->buffer;
int plain_non_ascii = 0;
char *reencoded = NULL;
char *reencoded = logmsg_reencode(commit);
if (*git_commit_encoding) {
reencoded = logmsg_reencode(commit);
if (reencoded) {
msg = reencoded;
len = strlen(msg);
}
}
if (reencoded)
msg = reencoded;
if (fmt == CMIT_FMT_ONELINE || fmt == CMIT_FMT_EMAIL)
indent = 0;
@@ -677,7 +680,7 @@ unsigned long pretty_print_commit(enum cmit_fmt fmt,
for (in_body = i = 0; (ch = msg[i]) && i < len; i++) {
if (!in_body) {
/* author could be non 7-bit ASCII but
* the log may so; skip over the
* the log may be so; skip over the
* header part first.
*/
if (ch == '\n' &&