From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 28 Dec 2011 19:49:37 +0000 (-0800)
Subject: Merge branch 'jk/follow-rename-score' into maint
X-Git-Tag: v1.7.8.2~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/0d5708594310c2603682f16cfcb742c3f11704f4?hp=9b0b0b4f45bc3d2f12391fe0dd4eaef81db97295

Merge branch 'jk/follow-rename-score' into maint

* jk/follow-rename-score:
use custom rename score during --follow
---

diff --git a/tree-diff.c b/tree-diff.c
index 7a51d091b5..28ad6db9ff 100644
--- a/tree-diff.c
+++ b/tree-diff.c
@@ -209,6 +209,7 @@ static void try_to_follow_renames(struct tree_desc *t1, struct tree_desc *t2, co
 	diff_opts.output_format = DIFF_FORMAT_NO_OUTPUT;
 	diff_opts.single_follow = opt->pathspec.raw[0];
 	diff_opts.break_opt = opt->break_opt;
+	diff_opts.rename_score = opt->rename_score;
 	paths[0] = NULL;
 	diff_tree_setup_paths(paths, &diff_opts);
 	if (diff_setup_done(&diff_opts) < 0)