Merge branch 'en/fast-export-encoding'
authorJunio C Hamano <gitster@pobox.com>
Thu, 13 Jun 2019 20:19:39 +0000 (13:19 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 13 Jun 2019 20:19:40 +0000 (13:19 -0700)
commit66dc7b68e4a332c662980b0266b9a1cb545f40ff
treeb0a77642e65e7dbb8eff9e6ed2b4c9b065e0c144
parentc0e78f7e4687e7bd5ff0b83974b28c1cc81c5487
parente80001f8fd7f608c6d05ce0ab2ebfc90d724a307
Merge branch 'en/fast-export-encoding'

The "git fast-export/import" pair has been taught to handle commits
with log messages in encoding other than UTF-8 better.

* en/fast-export-encoding:
  fast-export: do automatic reencoding of commit messages only if requested
  fast-export: differentiate between explicitly UTF-8 and implicitly UTF-8
  fast-export: avoid stripping encoding header if we cannot reencode
  fast-import: support 'encoding' commit header
  t9350: fix encoding test to actually test reencoding