From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 13 Jun 2019 20:19:39 +0000 (-0700)
Subject: Merge branch 'en/fast-export-encoding'
X-Git-Tag: v2.23.0-rc0~139
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/66dc7b68e4a332c662980b0266b9a1cb545f40ff

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
---

66dc7b68e4a332c662980b0266b9a1cb545f40ff