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>
Junio C Hamano committed
Feb 9, 2006 at 14:35 UTC
5b23683251801381a17b5c3e82940c268821681c
1 file changed
+2
-1
combine-diff.c
+2
-1
@@ -829,7 +829,7 @@ const char *diff_tree_combined_merge(const unsigned char *sha1,
829
struct combine_diff_path *p, *paths = NULL;
830
int num_parent, i, num_paths;
831
832
- diff_setup(&diffopts);
832
+ diffopts = *opt;
833
diffopts.output_format = DIFF_FORMAT_NO_OUTPUT;
834
diffopts.recursive = 1;
835
@@ -846,6 +846,7 @@ const char *diff_tree_combined_merge(const unsigned char *sha1,
846
struct commit *parent = parents->item;
847
diff_tree_sha1(parent->object.sha1, commit->object.sha1, "",
848
&diffopts);
849
+ diffcore_std(&diffopts);
850
paths = intersect_paths(paths, i, num_parent);
851
diff_flush(&diffopts);
852
}