mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge-recursive: option to specify rename threshold

Browse Source 
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 <kevin@sb.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Kevin Ballard
2010-09-27 16:58:25 -07:00
committed by Junio C Hamano
parent 4e5dd044c6
commit 10ae7526be
5 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
diff.c
View File

@ -3219,7 +3219,7 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac)
return 1;
}
static int parse_num(const char **cp_p)
int parse_rename_score(const char **cp_p)
{
unsigned long num, scale;
int ch, dot;
@ -3265,7 +3265,7 @@ static int diff_scoreopt_parse(const char *opt)
if (cmd != 'M' && cmd != 'C' && cmd != 'B')
return -1; /* that is not a -M, -C nor -B option */
opt1 = parse_num(&opt);
opt1 = parse_rename_score(&opt);
if (cmd != 'B')
opt2 = 0;
else {
@ -3275,7 +3275,7 @@ static int diff_scoreopt_parse(const char *opt)
return -1; /* we expect -B80/99 or -B80 */
else {
opt++;
opt2 = parse_num(&opt);
opt2 = parse_rename_score(&opt);
}
}
if (*opt != 0)