Merge branch 'jc/same-encoding'

Finishing touches to the series to unify "Do we need to reencode
between these two encodings?" logic.

* jc/same-encoding:
format_commit_message(): simplify calls to logmsg_reencode()

diff --cc pretty.c
Simple merge