mirror of
https://github.com/git/git
synced 2024-08-25 10:45:59 +00:00
combine-diff: Honour -z option correctly.
Combined diffs don't null terminate things in the same way as standard diffs. This is presumably wrong. Signed-off-by: Mark Wooding <mdw@distorted.org.uk> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
e70c6b3574
commit
6baf0484ef
|
@ -726,7 +726,7 @@ static int show_patch_diff(struct combine_diff_path *elem, int num_parent,
|
|||
|
||||
if (header) {
|
||||
shown_header++;
|
||||
puts(header);
|
||||
printf("%s%c", header, opt->line_termination);
|
||||
}
|
||||
printf("diff --%s ", dense ? "cc" : "combined");
|
||||
if (quote_c_style(elem->path, NULL, NULL, 0))
|
||||
|
@ -799,7 +799,7 @@ static void show_raw_diff(struct combine_diff_path *p, int num_parent, const cha
|
|||
inter_name_termination = 0;
|
||||
|
||||
if (header)
|
||||
puts(header);
|
||||
printf("%s%c", header, line_termination);
|
||||
|
||||
for (i = 0; i < num_parent; i++) {
|
||||
if (p->parent[i].mode)
|
||||
|
|
Loading…
Reference in a new issue