From d2c11a38c476bdfa3dd2387a0d933b8c00e4dfe3 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 27 Dec 2006 16:41:33 -0800 Subject: UTF-8: introduce i18n.logoutputencoding. It is plausible for somebody to want to view the commit log in a different encoding from i18n.commitencoding -- the project's policy may be UTF-8 and the user may be using a commit message hook to run iconv to conform to that policy (and either not have i18n.commitencoding to default to UTF-8 or have it explicitly set to UTF-8). Even then, Latin-1 may be more convenient for the usual pager and the terminal the user uses. The new variable i18n.logoutputencoding is used in preference to i18n.commitencoding to decide what encoding to recode the log output in when git-log and friends formats the commit log message. Signed-off-by: Junio C Hamano --- builtin-commit-tree.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'builtin-commit-tree.c') diff --git a/builtin-commit-tree.c b/builtin-commit-tree.c index 33c29f7495..146aaffd28 100644 --- a/builtin-commit-tree.c +++ b/builtin-commit-tree.c @@ -118,7 +118,9 @@ int cmd_commit_tree(int argc, const char **argv, const char *prefix) parents++; } - encoding_is_utf8 = !strcmp(git_commit_encoding, "utf-8"); + /* Not having i18n.commitencoding is the same as having utf-8 */ + encoding_is_utf8 = (!git_commit_encoding || + !strcmp(git_commit_encoding, "utf-8")); init_buffer(&buffer, &size); add_buffer(&buffer, &size, "tree %s\n", sha1_to_hex(tree_sha1)); -- cgit v1.2.1