X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=combine-diff.c;h=f17aab33f1d241097a16e2cfd8a1ab3361e45902;hb=ca557afff9f7dad7a8739cd193ac0730d872e282;hp=984103edce04d6313009ad4e7755c9eea3bf52e6;hpb=e70c6b35749c316f6e97099bd6bdac895c9d6f68;p=git.git

diff --git a/combine-diff.c b/combine-diff.c
index 984103ed..f17aab33 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -649,7 +649,7 @@ static int show_patch_diff(struct combine_diff_path *elem, int num_parent,
 			int len = st.st_size;
 			int cnt = 0;
 
-			elem->mode = DIFF_FILE_CANON_MODE(st.st_mode);
+			elem->mode = canon_mode(st.st_mode);
 			size = len;
 			result = xmalloc(len + 1);
 			while (cnt < len) {
@@ -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)