Merge branch 'nd/pretty-commit-log-message'

* nd/pretty-commit-log-message:
pretty.c: use original commit message if reencoding fails
pretty.c: free get_header() return value

diff --cc pretty.c
Simple merge