зеркало из https://github.com/microsoft/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>
This commit is contained in:
Родитель
5c91da25d7
Коммит
90c1b08c7d
|
@ -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,
|
||||
|
|
1
diff.c
1
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];
|
||||
|
|
Загрузка…
Ссылка в новой задаче