X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=diff-lib.c;h=ad2a4cde74e0c2ec6367a7128aa0732f131f6bdf;hb=69fb8283937a18a031aeef12ea2a530c8ccf3e83;hp=0aba6cda3c01e17b07bb7235b0395ba50256aedd;hpb=e2486193c54e5404bad1748d220f58a414867797;p=git.git

diff --git a/diff-lib.c b/diff-lib.c
index 0aba6cda3..ad2a4cde7 100644
--- a/diff-lib.c
+++ b/diff-lib.c
@@ -446,6 +446,8 @@ int run_diff_index(struct rev_info *revs, int cached)
 	memset(&opts, 0, sizeof(opts));
 	opts.head_idx = 1;
 	opts.index_only = cached;
+	opts.diff_index_cached = (cached &&
+				  !DIFF_OPT_TST(&revs->diffopt, FIND_COPIES_HARDER));
 	opts.merge = 1;
 	opts.fn = oneway_diff;
 	opts.unpack_data = revs;
@@ -502,6 +504,7 @@ int do_diff_cache(const unsigned char *tree_sha1, struct diff_options *opt)
 	memset(&opts, 0, sizeof(opts));
 	opts.head_idx = 1;
 	opts.index_only = 1;
+	opts.diff_index_cached = !DIFF_OPT_TST(opt, FIND_COPIES_HARDER);
 	opts.merge = 1;
 	opts.fn = oneway_diff;
 	opts.unpack_data = &revs;