summaryrefslogtreecommitdiff
path: root/builtin-mailinfo.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-12-28 00:41:33 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-12-28 00:41:33 (GMT)
commitd2c11a38c476bdfa3dd2387a0d933b8c00e4dfe3 (patch)
tree1b1a4f6c735c576d1d6736ca9031d2e826926a5e /builtin-mailinfo.c
parent52883fbd767f8a79a6f98a08907d0a9f6ba1ece1 (diff)
downloadgit-d2c11a38c476bdfa3dd2387a0d933b8c00e4dfe3.zip
git-d2c11a38c476bdfa3dd2387a0d933b8c00e4dfe3.tar.gz
git-d2c11a38c476bdfa3dd2387a0d933b8c00e4dfe3.tar.bz2
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 <junkio@cox.net>
Diffstat (limited to 'builtin-mailinfo.c')
-rw-r--r--builtin-mailinfo.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c
index 507b93f..a67f3eb 100644
--- a/builtin-mailinfo.c
+++ b/builtin-mailinfo.c
@@ -806,7 +806,8 @@ int cmd_mailinfo(int argc, const char **argv, const char *prefix)
if (!strcmp(argv[1], "-k"))
keep_subject = 1;
else if (!strcmp(argv[1], "-u"))
- metainfo_charset = git_commit_encoding;
+ metainfo_charset = (git_commit_encoding
+ ? git_commit_encoding : "utf-8");
else if (!strncmp(argv[1], "--encoding=", 11))
metainfo_charset = argv[1] + 11;
else