summaryrefslogtreecommitdiff
path: root/tree-diff.c
diff options
context:
space:
mode:
authorBo Yang <struggleyb.nku@gmail.com>2010-05-06 21:52:29 -0700
committerJunio C Hamano <gitster@pobox.com>2010-05-07 09:34:29 -0700
commit0cdca133ec8aa10fe4c806f6695ccbf32394aa91 (patch)
treedc980c8f84014a25cf39a00740b5896a0884ec7b /tree-diff.c
parent1da6175d438a9849db07a68326ee05f291510074 (diff)
downloadgit-0cdca133ec8aa10fe4c806f6695ccbf32394aa91.tar.gz
Make git log --follow find copies among unmodified files.
'git log --follow <path>' don't track copies from unmodified files, and this patch fix it. Signed-off-by: Bo Yang <struggleyb.nku@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'tree-diff.c')
-rw-r--r--tree-diff.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tree-diff.c b/tree-diff.c
index fe9f52c479..1fb3e94614 100644
--- a/tree-diff.c
+++ b/tree-diff.c
@@ -346,7 +346,7 @@ static void try_to_follow_renames(struct tree_desc *t1, struct tree_desc *t2, co
diff_setup(&diff_opts);
DIFF_OPT_SET(&diff_opts, RECURSIVE);
- diff_opts.detect_rename = DIFF_DETECT_RENAME;
+ DIFF_OPT_SET(&diff_opts, FIND_COPIES_HARDER);
diff_opts.output_format = DIFF_FORMAT_NO_OUTPUT;
diff_opts.single_follow = opt->paths[0];
diff_opts.break_opt = opt->break_opt;