diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c
index 507b93f6a707a2e44ee5f5b2abc55f0e6b096367..a67f3eb90b6f715714c6fa7bb931044630c74111 100644 (file)
--- a/builtin-mailinfo.c
+++ b/builtin-mailinfo.c
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