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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]> (cherry picked from 6baf048 commit)
ravibrk · Mar 1, 2006 · feffadd · feffadd
1 parent b9003c0
commit feffadd
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/combine-diff.c b/combine-diff.c
@@ -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)