diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-12-28 11:49:37 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-28 11:49:37 -0800 |
| commit | 0d5708594310c2603682f16cfcb742c3f11704f4 (patch) | |
| tree | b8062b3931c06598f2cbc6467660458052fed636 | |
| parent | Merge branch 'jc/checkout-m-twoway' into maint (diff) | |
| parent | use custom rename score during --follow (diff) | |
| download | tgif-0d5708594310c2603682f16cfcb742c3f11704f4.tar.xz | |
Merge branch 'jk/follow-rename-score' into maint
* jk/follow-rename-score:
use custom rename score during --follow
| -rw-r--r-- | tree-diff.c | 1 |
1 files changed, 1 insertions, 0 deletions
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) |