summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-12-30 02:18:24 -0800
committerLibravatar Junio C Hamano <junkio@cox.net>2006-12-30 02:18:24 -0800
commit4b46e22d48271d1a220133a925dc5009048eb577 (patch)
treece1c02dae62ea63a6c4e53d3f454cc553e778aff
parentMerge branch 'jc/curl' (diff)
downloadtgif-4b46e22d48271d1a220133a925dc5009048eb577.tar.xz
commit re-encoding: fix confusion between no and default conversion.
Telling the git-log family not to do any character conversion is done with --encoding=none, which sets log_output_encoding to an empty string. However, logmsg_reencode() confused this with log_output_encoding and commit_encoding set to NULL. The latter means we should use the default encoding (i.e. utf-8). Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--commit.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/commit.c b/commit.c
index eb06afbbe0..e13b9cb6a3 100644
--- a/commit.c
+++ b/commit.c
@@ -633,6 +633,8 @@ static char *logmsg_reencode(const struct commit *commit)
: git_commit_encoding);
if (!output_encoding)
+ output_encoding = "utf-8";
+ else if (!*output_encoding)
return NULL;
encoding = get_header(commit, "encoding");
if (!encoding || !strcmp(encoding, output_encoding)) {