format-patch previously didn't generate a newline after a subject. This caused the diffstat to not be displayed in messages without a blank line and the first blank line to be eaten in messages with a blank line.
This patch inserts a newline in two places - once in the loop to separate the subject part of the commit message from the body part of the commit message and another after the loop to counteract the eating of whitespace at the end of the message. --- commit.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-)
Show changes to commit.c +12 −2
diff --git a/commit.c b/commit.c index 522a6f3..8869b0d 100644 --- a/commit.c +++ b/commit.c @@ -655,6 +655,9 @@ unsigned long pretty_print_commit(enum c continue; } + if (!subject) + body = 1; + if (is_empty_line(line, &linelen)) { if (!body) continue; @@ -662,8 +665,6 @@ unsigned long pretty_print_commit(enum c continue; if (fmt == CMIT_FMT_SHORT) break; - } else { - body = 1; } if (subject) { @@ -694,6 +695,9 @@ unsigned long pretty_print_commit(enum c memcpy(buf + offset, after_subject, slen); offset += slen; after_subject = NULL; + } else if (fmt == CMIT_FMT_EMAIL && subject) { + /* separate the headers from the body */ + buf[offset++] = '\n'; } subject = NULL; } @@ -702,6 +706,12 @@ unsigned long pretty_print_commit(enum c /* Make sure there is an EOLN for the non-oneline case */ if (fmt != CMIT_FMT_ONELINE) 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'; return offset; }
