summaryrefslogtreecommitdiff
path: root/builtin-mailinfo.c
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2007-07-24 00:03:26 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-07-24 05:38:50 (GMT)
commit7296096c9d7e9fa12901c02fd1d12f4f996043e2 (patch)
tree64d34dff68e730917a4c55670baeb4554e63391c /builtin-mailinfo.c
parenta781785d8f1eb7adf05a24b121104716a086a67a (diff)
downloadgit-7296096c9d7e9fa12901c02fd1d12f4f996043e2.zip
git-7296096c9d7e9fa12901c02fd1d12f4f996043e2.tar.gz
git-7296096c9d7e9fa12901c02fd1d12f4f996043e2.tar.bz2
mailinfo: fix 'fatal: cannot convert from utf-8 to utf-8'
For some reason, I got this error message. Maybe it does not make sense, but then we should not really try to convert the text when it is not necessary. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-mailinfo.c')
-rw-r--r--builtin-mailinfo.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c
index a37a4ff..b4f6e91 100644
--- a/builtin-mailinfo.c
+++ b/builtin-mailinfo.c
@@ -529,6 +529,8 @@ static void convert_to_utf8(char *line, const char *charset)
return;
}
+ if (!strcmp(metainfo_charset, charset))
+ return;
out = reencode_string(line, metainfo_charset, charset);
if (!out)
die("cannot convert from %s to %s\n",