X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=combine-diff.c;h=011bb8db2dd4b5cbc22591c6e613247c14de4d2b;hb=86ff1d2012cc5e074d54c0823154019b99ca03f0;hp=eb0d757f47b74161c4bfc1212f4510a6790ff92a;hpb=944e3a88fe9fa767a9e0100661026992755ab917;p=git.git

diff --git a/combine-diff.c b/combine-diff.c
index eb0d757f..011bb8db 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -832,6 +832,7 @@ const char *diff_tree_combined_merge(const unsigned char *sha1,
 
 	diffopts = *opt;
 	diffopts.output_format = DIFF_FORMAT_NO_OUTPUT;
+	diffopts.with_raw = 0;
 	diffopts.recursive = 1;
 
 	/* count parents */
@@ -858,6 +859,16 @@ const char *diff_tree_combined_merge(const unsigned char *sha1,
 			num_paths++;
 	}
 	if (num_paths) {
+		if (opt->with_raw) {
+			int saved_format = opt->output_format;
+			opt->output_format = DIFF_FORMAT_RAW;
+			for (p = paths; p; p = p->next) {
+				if (show_combined_diff(p, num_parent, dense,
+						       header, opt))
+					header = NULL;
+			}
+			opt->output_format = saved_format;
+		}
 		for (p = paths; p; p = p->next) {
 			if (show_combined_diff(p, num_parent, dense,
 					       header, opt))