mailinfo: fix 'fatal: cannot convert from utf-8 to utf-8'

dscho · gitster · commit 7296096c9d7e · 2007-07-23T22:38:50.000-07:00
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 &lt;johannes.schindelin@gmx.de&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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",

Original file line number	Diff line number	Diff line change
`@@ -529,6 +529,8 @@ static void convert_to_utf8(char line, const char charset)`
`529`	`529`	`return;`
`530`	`530`	`}`
`531`	`531`
	`532`	`+ if (!strcmp(metainfo_charset, charset))`
	`533`	`+ return;`
`532`	`534`	`out = reencode_string(line, metainfo_charset, charset);`
`533`	`535`	`if (!out)`
`534`	`536`	`die("cannot convert from %s to %s\n",`