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>

diff --git a/commit.c b/commit.c
index 522a6f3aca644f968b825abf83e1fa6474b559eb..6ac3bf7554ec92cec2222c1f3a8f7d3565977688 100644 (file)
--- a/commit.c
+++ b/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 (!body)
                                continue;
                if (is_empty_line(line, &linelen)) {
                        if (!body)
                                continue;


@@ -662,8 +665,6 @@ unsigned long pretty_print_commit(enum cmit_fmt fmt, const struct commit *commit
                                continue;
                        if (fmt == CMIT_FMT_SHORT)
                                break;
                                continue;
                        if (fmt == CMIT_FMT_SHORT)
                                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 */
        if (fmt != CMIT_FMT_ONELINE)
                buf[offset++] = '\n';
        /* 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;
 }
        buf[offset] = '\0';
        return offset;
 }