summaryrefslogtreecommitdiff
path: root/pretty.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-10-19 05:41:56 (GMT)
committerJeff King <peff@peff.net>2012-11-04 13:10:33 (GMT)
commit0e18bcd5e937b9e5857892e7f5c80c3c5b1da5d4 (patch)
tree65ec6c8c507979ede028373a036d21c6c11ce49c /pretty.c
parent7e2010537e96d0a1144520222f20ba1dc3d61441 (diff)
downloadgit-0e18bcd5e937b9e5857892e7f5c80c3c5b1da5d4.zip
git-0e18bcd5e937b9e5857892e7f5c80c3c5b1da5d4.tar.gz
git-0e18bcd5e937b9e5857892e7f5c80c3c5b1da5d4.tar.bz2
reencode_string(): introduce and use same_encoding()
Callers of reencode_string() that re-encodes a string from one encoding to another all used ad-hoc way to bypass the case where the input and the output encodings are the same. Some did strcmp(), some did strcasecmp(), yet some others when converting to UTF-8 used is_encoding_utf8(). Introduce same_encoding() helper function to make these callers use the same logic. Notably, is_encoding_utf8() has a work-around for common misconfiguration to use "utf8" to name UTF-8 encoding, which does not match "UTF-8" hence strcasecmp() would not consider the same. Make use of it in this helper function. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'pretty.c')
-rw-r--r--pretty.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/pretty.c b/pretty.c
index 8b1ea9f..e87fe9f 100644
--- a/pretty.c
+++ b/pretty.c
@@ -504,7 +504,7 @@ char *logmsg_reencode(const struct commit *commit,
return NULL;
encoding = get_header(commit, "encoding");
use_encoding = encoding ? encoding : utf8;
- if (!strcmp(use_encoding, output_encoding))
+ if (same_encoding(use_encoding, output_encoding))
if (encoding) /* we'll strip encoding header later */
out = xstrdup(commit->buffer);
else