X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=combine-diff.c;h=fe5a2a1953a06204ad6f1c045bd06dd984d3acc6;hb=afc05f9f13beded8caf15d8e58d06fd64e0f7808;hp=ef622340a52afb3b31b1cdf678ae0a83fb85c923;hpb=11a264050f61bb15c413cced058db2ac96fd96f9;p=git.git

diff --git a/combine-diff.c b/combine-diff.c
index ef622340a..fe5a2a195 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -650,10 +650,7 @@ static void dump_quoted_path(const char *prefix, const char *path,
 			     const char *c_meta, const char *c_reset)
 {
 	printf("%s%s", c_meta, prefix);
-	if (quote_c_style(path, NULL, NULL, 0))
-		quote_c_style(path, NULL, stdout, 0);
-	else
-		printf("%s", path);
+	quote_c_style(path, NULL, stdout, 0);
 	printf("%s\n", c_reset);
 }
 
@@ -900,16 +897,7 @@ static void show_raw_diff(struct combine_diff_path *p, int num_parent, struct re
 		putchar(inter_name_termination);
 	}
 
-	if (line_termination) {
-		if (quote_c_style(p->path, NULL, NULL, 0))
-			quote_c_style(p->path, NULL, stdout, 0);
-		else
-			printf("%s", p->path);
-		putchar(line_termination);
-	}
-	else {
-		printf("%s%c", p->path, line_termination);
-	}
+	write_name_quoted(p->path, stdout, line_termination);
 }
 
 void show_combined_diff(struct combine_diff_path *p,