summaryrefslogtreecommitdiff
path: root/builtin-log.c
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2009-05-29 17:14:47 -0700
committerJunio C Hamano <gitster@pobox.com>2009-05-30 22:30:55 -0700
commit188643140bdcc5c8b7029058da87510cf1aeff50 (patch)
tree25fe03a1303c1047e3b703650715e31f1da398cf /builtin-log.c
parent0ddbbb66614c7a503442ff863817ccbc68f417ab (diff)
parented43bc8c4c30199cfba5e6ce9f8037c8c454cf5c (diff)
downloadgit-188643140bdcc5c8b7029058da87510cf1aeff50.tar.gz
t9139 uses ancient, backwards-compatible iconv names
This resolves a semantic conflicts early to work with 5ae93df (t3900: use ancient iconv names for backward compatibility, 2009-05-18). Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-log.c')
-rw-r--r--builtin-log.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-log.c b/builtin-log.c
index f10cfebdbb..17d06bf202 100644
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -619,7 +619,7 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout,
struct shortlog log;
struct strbuf sb = STRBUF_INIT;
int i;
- const char *encoding = "utf-8";
+ const char *encoding = "UTF-8";
struct diff_options opts;
int need_8bit_cte = 0;
struct commit *commit = NULL;