diff options
| author | Eric Wong <normalperson@yhbt.net> | 2009-05-29 17:14:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-30 22:30:55 -0700 |
| commit | 188643140bdcc5c8b7029058da87510cf1aeff50 (patch) | |
| tree | 25fe03a1303c1047e3b703650715e31f1da398cf /pretty.c | |
| parent | 0ddbbb66614c7a503442ff863817ccbc68f417ab (diff) | |
| parent | ed43bc8c4c30199cfba5e6ce9f8037c8c454cf5c (diff) | |
| download | git-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 'pretty.c')
| -rw-r--r-- | pretty.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -284,7 +284,7 @@ static char *replace_encoding_header(char *buf, const char *encoding) static char *logmsg_reencode(const struct commit *commit, const char *output_encoding) { - static const char *utf8 = "utf-8"; + static const char *utf8 = "UTF-8"; const char *use_encoding; char *encoding; char *out; @@ -881,7 +881,7 @@ char *reencode_commit_message(const struct commit *commit, const char **encoding ? git_log_output_encoding : git_commit_encoding); if (!encoding) - encoding = "utf-8"; + encoding = "UTF-8"; if (encoding_p) *encoding_p = encoding; return logmsg_reencode(commit, encoding); |