merge-recursive: find-renames resets threshold
Make the find-renames option follow the behaviour in git-diff, where it resets the threshold when none is given. So, for instance, "--find-renames=25 --find-renames" should result in the default threshold (50%) instead of 25%. Signed-off-by: Felipe Gonçalves Assis <felipegassis@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Felipe Gonçalves Assis committed
Feb 21, 2016 at 19:59 UTC
87892f605be16037bc910ca2cf9fa21bb9467f5e
1 file changed
+3
-1
merge-recursive.c
+3
-1
@@ -2094,8 +2094,10 @@ int parse_merge_opt(struct merge_options *o, const char *s)
2094
o->renormalize = 0;
2095
else if (!strcmp(s, "no-renames"))
2096
o->detect_rename = 0;
2097
- else if (!strcmp(s, "find-renames"))
2097
+ else if (!strcmp(s, "find-renames")) {
2098
o->detect_rename = 1;
2099
+ o->rename_score = 0;
2100
+ }
2101
else if (skip_prefix(s, "find-renames=", &arg) ||
2102
skip_prefix(s, "rename-threshold=", &arg)) {
2103
if ((o->rename_score = parse_rename_score(&arg)) == -1 || *arg != 0)