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>
Petr Baudis committed
Apr 11, 2006 at 13:30 UTC
90c1b08c7dc5be890e697237f67a188da235ffc8
2 files changed
+2
combine-diff.c
+1
@@ -868,6 +868,7 @@ const char *diff_tree_combined_merge(const unsigned char *sha1,
868
header = NULL;
869
}
870
opt->output_format = saved_format;
871
+ putchar(opt->line_termination);
872
}
873
for (p = paths; p; p = p->next) {
874
if (show_combined_diff(p, num_parent, dense,
diff.c
+1
@@ -1322,6 +1322,7 @@ void diff_flush(struct diff_options *options)
1322
struct diff_filepair *p = q->queue[i];
1323
flush_one_pair(p, DIFF_FORMAT_RAW, options);
1324
}
1325
+ putchar(options->line_termination);
1326
}
1327
for (i = 0; i < q->nr; i++) {
1328
struct diff_filepair *p = q->queue[i];