development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-11-05 18:59:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

combine-diff: Honour -z option correctly.

Browse source 
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:
Mark Wooding 2006-02-27 12:52:52 +00:00 committed by Junio C Hamano
parent e70c6b3574
commit 6baf0484ef
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
combine-diff.c
View file

@ -726,7 +726,7 @@ static int show_patch_diff(struct combine_diff_path *elem, int num_parent,
if (header) { if (header) {
shown_header++; shown_header++;
puts(header); printf("%s%c", header, opt->line_termination);
} }
printf("diff --%s ", dense ? "cc" : "combined"); printf("diff --%s ", dense ? "cc" : "combined");
if (quote_c_style(elem->path, NULL, NULL, 0)) 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; inter_name_termination = 0;
if (header) if (header)
puts(header); printf("%s%c", header, line_termination);
for (i = 0; i < num_parent; i++) { for (i = 0; i < num_parent; i++) {
if (p->parent[i].mode) if (p->parent[i].mode)