Separate the raw diff and patch with a newline

Petr Baudis · Junio C Hamano · commit 90c1b08c7dc5 · 2006-04-11T11:17:50.000-07:00
More friendly for human reading I believe, and possibly friendlier to some
parsers (although only by an epsilon).

Signed-off-by: Petr Baudis &lt;pasky@suse.cz&gt;
Signed-off-by: Junio C Hamano &lt;junkio@cox.net&gt;
diff --git 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
@@ -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];

Original file line number	Diff line number	Diff line change
`@@ -868,6 +868,7 @@ const char diff_tree_combined_merge(const unsigned char sha1,`
`868`	`868`	`header = NULL;`
`869`	`869`	`}`
`870`	`870`	`opt->output_format = saved_format;`
	`871`	`+ putchar(opt->line_termination);`
`871`	`872`	`}`
`872`	`873`	`for (p = paths; p; p = p->next) {`
`873`	`874`	`if (show_combined_diff(p, num_parent, dense,`
Original file line number	Diff line number	Diff line change
`@@ -1322,6 +1322,7 @@ void diff_flush(struct diff_options *options)`
`1322`	`1322`	`struct diff_filepair *p = q->queue[i];`
`1323`	`1323`	`flush_one_pair(p, DIFF_FORMAT_RAW, options);`
`1324`	`1324`	`}`
	`1325`	`+ putchar(options->line_termination);`
`1325`	`1326`	`}`
`1326`	`1327`	`for (i = 0; i < q->nr; i++) {`
`1327`	`1328`	`struct diff_filepair *p = q->queue[i];`