undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i18n.logToUTF8: convert commit log message to UTF-8

Browse Source 
When i18n.commitencoding is set to a non UTF-8 encoding,
commit-tree records the encoding in an extra header after
author/committer headers in the commit object.

An earlier version used trailer but Johannes points out that
there is little risk breaking existing Porcelains with a new
header.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2006-12-23 23:53:02 -08:00
parent b45974a655
commit 4b2bced559
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
builtin-commit-tree.c
View File

@ -92,6 +92,7 @@ int cmd_commit_tree(int argc, const char **argv, const char *prefix)
char comment[1000]; char comment[1000];
char *buffer; char *buffer;
unsigned int size; unsigned int size;
int encoding_is_utf8;
setup_ident(); setup_ident();
git_config(git_default_config); git_config(git_default_config);
@ -117,6 +118,8 @@ int cmd_commit_tree(int argc, const char **argv, const char *prefix)
parents++; parents++;
} }
encoding_is_utf8 = !strcmp(git_commit_encoding, "utf-8");
init_buffer(&buffer, &size); init_buffer(&buffer, &size);
add_buffer(&buffer, &size, "tree %s\n", sha1_to_hex(tree_sha1)); add_buffer(&buffer, &size, "tree %s\n", sha1_to_hex(tree_sha1));
@ -130,7 +133,11 @@ int cmd_commit_tree(int argc, const char **argv, const char *prefix)
/* Person/date information */ /* Person/date information */
add_buffer(&buffer, &size, "author %s\n", git_author_info(1)); add_buffer(&buffer, &size, "author %s\n", git_author_info(1));
add_buffer(&buffer, &size, "committer %s\n\n", git_committer_info(1)); add_buffer(&buffer, &size, "committer %s\n", git_committer_info(1));
if (!encoding_is_utf8)
add_buffer(&buffer, &size,
"encoding %s\n", git_commit_encoding);
add_buffer(&buffer, &size, "\n");
/* And add the comment */ /* And add the comment */
while (fgets(comment, sizeof(comment), stdin) != NULL) while (fgets(comment, sizeof(comment), stdin) != NULL)
@ -138,7 +145,7 @@ int cmd_commit_tree(int argc, const char **argv, const char *prefix)
/* And check the encoding */ /* And check the encoding */
buffer[size] = '\0'; buffer[size] = '\0';
if (!strcmp(git_commit_encoding, "utf-8") && !is_utf8(buffer)) if (encoding_is_utf8 && !is_utf8(buffer))
fprintf(stderr, commit_utf8_warn); fprintf(stderr, commit_utf8_warn);
if (!write_sha1_file(buffer, size, commit_type, commit_sha1)) { if (!write_sha1_file(buffer, size, commit_type, commit_sha1)) {