[PATCH] Separate the raw diff and patch with a newline

From

Petr Baudis <pasky@suse.cz>

Date

Apr 11, 2006, 11:30 UTC

Message-ID

<20060411113045.12117.10948.stgit@machine.or.cz>

In-Reply-To

<7vr7456jb4.fsf@assigned-by-dhcp.cox.net>

Signed-off-by: Petr Baudis <pasky@suse.cz>
---

 combine-diff.c |    1 +
 diff.c         |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/combine-diff.c b/combine-diff.c
index 748dc30..0e25788 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -867,6 +867,7 @@ const char *diff_tree_combined_merge(con
 					header = NULL;
 			}
 			opt->output_format = DIFF_FORMAT_PATCH;
+			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 00c79aa..86e4251 100644
--- a/diff.c
+++ b/diff.c
@@ -1322,6 +1322,7 @@ void diff_flush(struct diff_options *opt
 			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];