From: Junio C Hamano <junkio@cox.net>
Date: Thu, 9 Feb 2006 22:35:19 +0000 (-0800)
Subject: combined-diff: use diffcore before intersecting paths.
X-Git-Tag: v1.2.0~21^2~3
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=5b23683251801381a17b5c3e82940c268821681c;p=git.git

combined-diff: use diffcore before intersecting paths.

This is needed to make "diff-tree -c -M" to work semi-sensibly.
Otherwise rename detection, pickaxe and friends would never be
invoked.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/combine-diff.c b/combine-diff.c
index 15f369e8..6d783054 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -829,7 +829,7 @@ const char *diff_tree_combined_merge(const unsigned char *sha1,
 	struct combine_diff_path *p, *paths = NULL;
 	int num_parent, i, num_paths;
 
-	diff_setup(&diffopts);
+	diffopts = *opt;
 	diffopts.output_format = DIFF_FORMAT_NO_OUTPUT;
 	diffopts.recursive = 1;
 
@@ -846,6 +846,7 @@ const char *diff_tree_combined_merge(const unsigned char *sha1,
 		struct commit *parent = parents->item;
 		diff_tree_sha1(parent->object.sha1, commit->object.sha1, "",
 			       &diffopts);
+		diffcore_std(&diffopts);
 		paths = intersect_paths(paths, i, num_parent);
 		diff_flush(&diffopts);
 	}