Merge branch 'rs/convert-fix-utf-without-dash'
authorJunio C Hamano <gitster@pobox.com>
Wed, 9 Oct 2019 05:01:00 +0000 (14:01 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 9 Oct 2019 05:01:00 +0000 (14:01 +0900)
commitd17f54947d9074e92bfbeabc05d5c39147456fe3
tree729b922e62f03885d1357042fd9f97909b1e83bf
parent82c80f98e6727aa4551235beb8ffa68985b83d93
parentb181676ce9e8c89a39737f098d9b9c4f774596cf
Merge branch 'rs/convert-fix-utf-without-dash'

The code to skip "UTF" and "UTF-" prefix, when computing an advice
message, did not work correctly when the prefix was "UTF", which
has been fixed.

* rs/convert-fix-utf-without-dash:
  convert: fix handling of dashless UTF prefix in validate_encoding()
convert.c