undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Separate the raw diff and patch with a newline

Browse Source 
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:
Petr Baudis 2006-04-11 13:30:46 +02:00 committed by Junio C Hamano
parent 5c91da25d7
commit 90c1b08c7d
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
combine-diff.c
View File

@ -868,6 +868,7 @@ const char *diff_tree_combined_merge(const unsigned char *sha1,
header = NULL; header = NULL;
} }
opt->output_format = saved_format; opt->output_format = saved_format;
putchar(opt->line_termination);
} }
for (p = paths; p; p = p->next) { for (p = paths; p; p = p->next) {
if (show_combined_diff(p, num_parent, dense, if (show_combined_diff(p, num_parent, dense,

1
diff.c
View File

@ -1322,6 +1322,7 @@ void diff_flush(struct diff_options *options)
struct diff_filepair *p = q->queue[i]; struct diff_filepair *p = q->queue[i];
flush_one_pair(p, DIFF_FORMAT_RAW, options); flush_one_pair(p, DIFF_FORMAT_RAW, options);
} }
putchar(options->line_termination);
} }
for (i = 0; i < q->nr; i++) { for (i = 0; i < q->nr; i++) {
struct diff_filepair *p = q->queue[i]; struct diff_filepair *p = q->queue[i];