Merge branch 'jc/format-patch-encoding'

* jc/format-patch-encoding:
test format-patch -s: make sure MIME content type is shown as needed
format-patch -s: add MIME encoding header if signer's name requires so

diff --cc builtin-branch.c
Simple merge