From: Petr Baudis <pasky@suse.cz>
Date: Tue, 11 Apr 2006 11:30:46 +0000 (+0200)
Subject: Separate the raw diff and patch with a newline
X-Git-Tag: v1.3.0-rc4~20^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=90c1b08c7dc5be890e697237f67a188da235ffc8;p=git.git

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 011bb8db2..5f6048b39 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 99d76d01e..a14e6644c 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];