mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
format-patch: Generate a newline between the subject header and the message body
format-patch previously didn't generate a newline after a subject. This caused the diffstat to not be displayed in messages with only one line for the commit message. This patch fixes this by adding a newline after the headers if a body hasn't been added. Signed-off-by: Robert Shearman <rob@codeweavers.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
a40d384cac
commit
19b3bd3e2d
11
commit.c
11
commit.c
|
@ -655,6 +655,9 @@ unsigned long pretty_print_commit(enum cmit_fmt fmt, const struct commit *commit
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!subject)
|
||||||
|
body = 1;
|
||||||
|
|
||||||
if (is_empty_line(line, &linelen)) {
|
if (is_empty_line(line, &linelen)) {
|
||||||
if (!body)
|
if (!body)
|
||||||
continue;
|
continue;
|
||||||
|
@ -662,8 +665,6 @@ unsigned long pretty_print_commit(enum cmit_fmt fmt, const struct commit *commit
|
||||||
continue;
|
continue;
|
||||||
if (fmt == CMIT_FMT_SHORT)
|
if (fmt == CMIT_FMT_SHORT)
|
||||||
break;
|
break;
|
||||||
} else {
|
|
||||||
body = 1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (subject) {
|
if (subject) {
|
||||||
|
@ -702,6 +703,12 @@ unsigned long pretty_print_commit(enum cmit_fmt fmt, const struct commit *commit
|
||||||
/* Make sure there is an EOLN for the non-oneline case */
|
/* Make sure there is an EOLN for the non-oneline case */
|
||||||
if (fmt != CMIT_FMT_ONELINE)
|
if (fmt != CMIT_FMT_ONELINE)
|
||||||
buf[offset++] = '\n';
|
buf[offset++] = '\n';
|
||||||
|
/*
|
||||||
|
* make sure there is another EOLN to separate the headers from whatever
|
||||||
|
* body the caller appends if we haven't already written a body
|
||||||
|
*/
|
||||||
|
if (fmt == CMIT_FMT_EMAIL && !body)
|
||||||
|
buf[offset++] = '\n';
|
||||||
buf[offset] = '\0';
|
buf[offset] = '\0';
|
||||||
return offset;
|
return offset;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue