Merge branch 'jc/prettier-pretty-note'
Emit the notes attached to the commit in "format-patch --notes" output after three-dashes. * jc/prettier-pretty-note: format-patch: add a blank line between notes and diffstat Doc User-Manual: Patch cover letter, three dashes, and --notes Doc format-patch: clarify --notes use case Doc notes: Include the format-patch --notes option Doc SubmittingPatches: Mention --notes option after "cover letter" Documentation: decribe format-patch --notes format-patch --notes: show notes after three-dashes format-patch: append --signature after notes pretty_print_commit(): do not append notes message pretty: prepare notes message at a centralized place format_note(): simplify API pretty: remove reencode_commit_message()
This commit is contained in:
@ -1425,7 +1425,7 @@ static void get_commit_info(struct commit *commit,
|
||||
int detailed)
|
||||
{
|
||||
int len;
|
||||
const char *subject;
|
||||
const char *subject, *encoding;
|
||||
char *reencoded, *message;
|
||||
static char author_name[1024];
|
||||
static char author_mail[1024];
|
||||
@ -1446,7 +1446,8 @@ static void get_commit_info(struct commit *commit,
|
||||
die("Cannot read commit %s",
|
||||
sha1_to_hex(commit->object.sha1));
|
||||
}
|
||||
reencoded = reencode_commit_message(commit, NULL);
|
||||
encoding = get_log_output_encoding();
|
||||
reencoded = logmsg_reencode(commit, encoding);
|
||||
message = reencoded ? reencoded : commit->buffer;
|
||||
ret->author = author_name;
|
||||
ret->author_mail = author_mail;
|
||||
|
Reference in New Issue
Block a user