Johannes Schindelin <Johannes.Schindelin@xxxxxx> writes: > On Sat, 30 Dec 2006, Marco Costalba wrote: > >> When 'commitencoding' variable is set in config file then git-rev-list >> called with --header option sends also the encoding information. > > As Jakub pointed out, qgit should not expect to know all headers. I am > very sorry, since I said I looked at all parsers of the commit header in > git, but that was _only_ git, and no porcelains. > > Please fix qgit, since I really consider this a bug. I have to agree with Johannes. In principle Porcelains should be prepared to see and ignore unknown headers. However, this commit created by `commit-tree` certalinly can be improved. $ git rev-list --header -n1 HEAD 6d751699cb04150abd79a730187d4e2ed6330c05 tree 70209eebdc59d108948feb15c3c5497f299ef290 parent 49a8186d7352d0454df79b289fecb18c8e535c32 author Marco Costalba <mcostalba@xxxxxxxxx> 1167500660 +0100 committer Marco Costalba <mcostalba@xxxxxxxxx> 1167500660 +0100 encoding UTF-8 Test commit Let's see what git-rev-list --header spits out. Signed-off-by: Marco Costalba <mcostalba@xxxxxxxxx> -- >8 -- commit-tree: cope with different ways "utf-8" can be spelled. People can spell config.commitencoding differently from what we internally have ("utf-8") to mean UTF-8. Try to accept them and treat them equally. Signed-off-by: Junio C Hamano <junkio@xxxxxxx> --- diff --git a/builtin-commit-tree.c b/builtin-commit-tree.c index 146aaff..0651e59 100644 --- a/builtin-commit-tree.c +++ b/builtin-commit-tree.c @@ -119,8 +119,7 @@ int cmd_commit_tree(int argc, const char **argv, const char *prefix) } /* Not having i18n.commitencoding is the same as having utf-8 */ - encoding_is_utf8 = (!git_commit_encoding || - !strcmp(git_commit_encoding, "utf-8")); + encoding_is_utf8 = is_encoding_utf8(git_commit_encoding); init_buffer(&buffer, &size); add_buffer(&buffer, &size, "tree %s\n", sha1_to_hex(tree_sha1)); diff --git a/utf8.c b/utf8.c index 1eedd8b..7c80eec 100644 --- a/utf8.c +++ b/utf8.c @@ -277,6 +277,15 @@ void print_wrapped_text(const char *text, int indent, int indent2, int width) } } +int is_encoding_utf8(const char *name) +{ + if (!name) + return 1; + if (!strcasecmp(name, "utf-8") || !strcasecmp(name, "utf8")) + return 1; + return 0; +} + /* * Given a buffer and its encoding, return it re-encoded * with iconv. If the conversion fails, returns NULL. diff --git a/utf8.h b/utf8.h index cae2a8e..a07c5a8 100644 --- a/utf8.h +++ b/utf8.h @@ -3,6 +3,8 @@ int utf8_width(const char **start); int is_utf8(const char *text); +int is_encoding_utf8(const char *name); + void print_wrapped_text(const char *text, int indent, int indent2, int len); #ifndef NO_ICONV - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html