undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge-recursive: more consistent interface

Browse Source 
Add strategy option find-renames, following git-diff interface. This
makes the option rename-threshold redundant.

Signed-off-by: Felipe Gonçalves Assis <felipegassis@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Felipe Gonçalves Assis 2016-02-17 01:15:26 -02:00 committed by Junio C Hamano
parent d2b11eca7e
commit 1b47ad160b
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Documentation/merge-strategies.txt
View File

@ -85,11 +85,13 @@ no-renames;;
Turn off rename detection. Turn off rename detection.
See also linkgit:git-diff[1] `--no-renames`. See also linkgit:git-diff[1] `--no-renames`.
find-renames[=<n>];;
Turn on rename detection, optionally setting the the similarity
threshold. This is the default.
See also linkgit:git-diff[1] `--find-renames`.
rename-threshold=<n>;; rename-threshold=<n>;;
Controls the similarity threshold used for rename detection. Deprecated synonym for `find-renames=<n>`.
Re-enables rename detection if disabled by a preceding
`no-renames`.
See also linkgit:git-diff[1] `-M`.
subtree[=<path>];; subtree[=<path>];;
This option is a more advanced form of 'subtree' strategy, where This option is a more advanced form of 'subtree' strategy, where

5
merge-recursive.c
View File

@ -2094,7 +2094,10 @@ int parse_merge_opt(struct merge_options *o, const char *s)
o->renormalize = 0; o->renormalize = 0;
else if (!strcmp(s, "no-renames")) else if (!strcmp(s, "no-renames"))
o->detect_rename = 0; o->detect_rename = 0;
else if (skip_prefix(s, "rename-threshold=", &arg)) { else if (!strcmp(s, "find-renames"))
o->detect_rename = 1;
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) if ((o->rename_score = parse_rename_score(&arg)) == -1 || *arg != 0)
return -1; return -1;
o->detect_rename = 1; o->detect_rename = 1;