[PATCH 3/4] utf8: die if failed to re-encoding
From: Nguyễn Thái Ngọc Duy <hidden>
Date: 2016-06-15 22:53:07
Subsystem:
the rest · Maintainer:
Linus Torvalds
Return value NULL in this case means "no conversion needed", which is not quite true when conv == -1. Signed-off-by: Nguyễn Thái Ngọc Duy <redacted> --- t/t4201-shortlog.sh | 2 +- utf8.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t4201-shortlog.sh b/t/t4201-shortlog.sh
index 6872ba1..d445665 100755
--- a/t/t4201-shortlog.sh
+++ b/t/t4201-shortlog.sh@@ -27,7 +27,7 @@ test_expect_success 'setup' ' tr 1234 "\360\235\204\236")" a1 && # now fsck up the utf8 - git config i18n.commitencoding non-utf-8 && + git config i18n.commitencoding viscii && echo 4 >a1 && git commit --quiet -m "$( echo "This is a very, very long first line for the commit message to see if it is wrapped correctly" |
diff --git a/utf8.c b/utf8.c
index def93ee..f918e9e 100644
--- a/utf8.c
+++ b/utf8.c@@ -444,7 +444,7 @@ char *reencode_string(const char *in, const char *out_encoding, const char *in_e return NULL; conv = iconv_open(out_encoding, in_encoding); if (conv == (iconv_t) -1) - return NULL; + die("failed to convert from %s to %s", in_encoding, out_encoding); insz = strlen(in); outsz = insz; outalloc = outsz + 1; /* for terminating NUL */
--
1.7.8.36.g69ee2