From: Felipe Gonçalves Assis Date: Sun, 21 Feb 2016 15:09:14 GMT Subject: [PATCH 1/5] merge-recursive: find-renames resets threshold Message-ID: <1456067358-19781-2-git-send-email-felipegassis@gmail.com> In-Reply-To: <1456067358-19781-1-git-send-email-felipegassis@gmail.com> 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 --- merge-recursive.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/merge-recursive.c b/merge-recursive.c index 7bff5be..b880ae5 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) -- 2.7.1.492.gc9722f8