format-patch: Generate a newline between the subject header and the message body

PATCH New Robert Shearman 1 participant 1 message Jun 15, 2016

Share & tools

Robert Shearman

author

2016-06-15 22:42 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

---
 commit.c |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

commit.c +9 -2

index 522a6f3..6ac3bf7 100644
@@ -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) {

@@ -702,6 +703,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;
 }