summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorFelipe Gonçalves Assis <felipeg.assis@gmail.com>2016-02-21 19:59:05 -0300
committerJunio C Hamano <gitster@pobox.com>2016-02-24 10:39:02 -0800
commit87892f605be16037bc910ca2cf9fa21bb9467f5e (patch)
tree6f279a354a962388b3b3014b26e25a4bcff712b7 /merge-recursive.c
parent83837ec0b43bfd832ea00cd96e8b47c90991c473 (diff)
downloadgit-87892f605be16037bc910ca2cf9fa21bb9467f5e.tar.gz
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>
Diffstat (limited to 'merge-recursive.c')
-rw-r--r--merge-recursive.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c
index 7bff5be164..b880ae50e7 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -2094,8 +2094,10 @@ int parse_merge_opt(struct merge_options *o, const char *s)
o->renormalize = 0;
else if (!strcmp(s, "no-renames"))
o->detect_rename = 0;
- else if (!strcmp(s, "find-renames"))
+ else if (!strcmp(s, "find-renames")) {
o->detect_rename = 1;
+ o->rename_score = 0;
+ }
else if (skip_prefix(s, "find-renames=", &arg) ||
skip_prefix(s, "rename-threshold=", &arg)) {
if ((o->rename_score = parse_rename_score(&arg)) == -1 || *arg != 0)