diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-02-09 14:35:19 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-02-09 14:35:19 -0800 |
| commit | 5b23683251801381a17b5c3e82940c268821681c (patch) | |
| tree | 111f020b87fe443f5bc815df4971d5577e2c18a0 | |
| parent | ee63802422af14e43eccce3c6dc4150a27ceb1a3 (diff) | |
| download | git-5b23683251801381a17b5c3e82940c268821681c.tar.gz git-5b23683251801381a17b5c3e82940c268821681c.tar.xz | |
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>
| -rw-r--r-- | combine-diff.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/combine-diff.c b/combine-diff.c index 15f369e8e..6d783054d 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); } |