Separate the raw diff and patch with a newline

More friendly for human reading I believe, and possibly friendlier to some
parsers (although only by an epsilon).

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/combine-diff.c b/combine-diff.c
index 011bb8db2dd4b5cbc22591c6e613247c14de4d2b..5f6048b397f41f00362c9d83c38a28e420340093 100644 (file)
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -868,6 +868,7 @@ const char *diff_tree_combined_merge(const unsigned char *sha1,
                                        header = NULL;
                        }
                        opt->output_format = saved_format;
+                       putchar(opt->line_termination);
                }
                for (p = paths; p; p = p->next) {
                        if (show_combined_diff(p, num_parent, dense,

diff --git a/diff.c b/diff.c
index 99d76d01e3c0b14e96742292addf4d121afb6ab7..a14e6644ca9a39d0a0e1702ccefadf7a5bb64081 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -1322,6 +1322,7 @@ void diff_flush(struct diff_options *options)
                        struct diff_filepair *p = q->queue[i];
                        flush_one_pair(p, DIFF_FORMAT_RAW, options);
                }
+               putchar(options->line_termination);
        }
        for (i = 0; i < q->nr; i++) {
                struct diff_filepair *p = q->queue[i];