From 10ae7526bebb505ddddba01f76ec97d5f7b5e0e5 Mon Sep 17 00:00:00 2001 From: Kevin Ballard Date: Mon, 27 Sep 2010 16:58:25 -0700 Subject: merge-recursive: option to specify rename threshold The recursive merge strategy turns on rename detection but leaves the rename threshold at the default. Add a strategy option to allow the user to specify a rename threshold to use. Signed-off-by: Kevin Ballard Signed-off-by: Junio C Hamano --- merge-recursive.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'merge-recursive.c') diff --git a/merge-recursive.c b/merge-recursive.c index 9b9f97e6af..148c550fee 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -339,6 +339,7 @@ static struct string_list *get_renames(struct merge_options *o, opts.rename_limit = o->merge_rename_limit >= 0 ? o->merge_rename_limit : o->diff_rename_limit >= 0 ? o->diff_rename_limit : 500; + opts.rename_score = o->rename_score; opts.warn_on_too_large_rename = 1; opts.output_format = DIFF_FORMAT_NO_OUTPUT; if (diff_setup_done(&opts) < 0) @@ -1525,6 +1526,11 @@ int parse_merge_opt(struct merge_options *o, const char *s) o->renormalize = 1; else if (!strcmp(s, "no-renormalize")) o->renormalize = 0; + else if (!prefixcmp(s, "rename-threshold=")) { + const char *score = s + strlen("rename-threshold="); + if ((o->rename_score = parse_rename_score(&score)) == -1 || *score != 0) + return -1; + } else return -1; return 0; -- cgit v1.2.3