From 90c1b08c7dc5be890e697237f67a188da235ffc8 Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Tue, 11 Apr 2006 13:30:46 +0200 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- combine-diff.c | 1 + diff.c | 1 + 2 files changed, 2 insertions(+) diff --git a/combine-diff.c b/combine-diff.c index 011bb8db2d..5f6048b397 100644 --- 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 99d76d01e3..a14e6644ca 100644 --- 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]; -- 2.11.4.GIT