Merge branch 'kb/diff-C-M-synonym'
* kb/diff-C-M-synonym: diff: use "find" instead of "detect" as prefix for long forms of -M and -C diff: add --detect-copies-harder as a synonym for --find-copies-harder
This commit is contained in:
commit
cf7a64b54a
@ -230,7 +230,7 @@ eligible for being picked up as a possible source of a rename to
|
||||
another file.
|
||||
|
||||
-M[<n>]::
|
||||
--detect-renames[=<n>]::
|
||||
--find-renames[=<n>]::
|
||||
ifndef::git-log[]
|
||||
Detect renames.
|
||||
endif::git-log[]
|
||||
@ -246,7 +246,7 @@ endif::git-log[]
|
||||
hasn't changed.
|
||||
|
||||
-C[<n>]::
|
||||
--detect-copies[=<n>]::
|
||||
--find-copies[=<n>]::
|
||||
Detect copies as well as renames. See also `--find-copies-harder`.
|
||||
If `n` is specified, it has the same meaning as for `-M<n>`.
|
||||
|
||||
|
16
diff.c
16
diff.c
@ -3154,14 +3154,14 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac)
|
||||
if ((options->break_opt = diff_scoreopt_parse(arg)) == -1)
|
||||
return error("invalid argument to -B: %s", arg+2);
|
||||
}
|
||||
else if (!prefixcmp(arg, "-M") || !prefixcmp(arg, "--detect-renames=") ||
|
||||
!strcmp(arg, "--detect-renames")) {
|
||||
else if (!prefixcmp(arg, "-M") || !prefixcmp(arg, "--find-renames=") ||
|
||||
!strcmp(arg, "--find-renames")) {
|
||||
if ((options->rename_score = diff_scoreopt_parse(arg)) == -1)
|
||||
return error("invalid argument to -M: %s", arg+2);
|
||||
options->detect_rename = DIFF_DETECT_RENAME;
|
||||
}
|
||||
else if (!prefixcmp(arg, "-C") || !prefixcmp(arg, "--detect-copies=") ||
|
||||
!strcmp(arg, "--detect-copies")) {
|
||||
else if (!prefixcmp(arg, "-C") || !prefixcmp(arg, "--find-copies=") ||
|
||||
!strcmp(arg, "--find-copies")) {
|
||||
if (options->detect_rename == DIFF_DETECT_COPY)
|
||||
DIFF_OPT_SET(options, FIND_COPIES_HARDER);
|
||||
if ((options->rename_score = diff_scoreopt_parse(arg)) == -1)
|
||||
@ -3384,12 +3384,12 @@ static int diff_scoreopt_parse(const char *opt)
|
||||
opt += strlen("break-rewrites");
|
||||
if (*opt == 0 || *opt++ == '=')
|
||||
cmd = 'B';
|
||||
} else if (!prefixcmp(opt, "detect-copies")) {
|
||||
opt += strlen("detect-copies");
|
||||
} else if (!prefixcmp(opt, "find-copies")) {
|
||||
opt += strlen("find-copies");
|
||||
if (*opt == 0 || *opt++ == '=')
|
||||
cmd = 'C';
|
||||
} else if (!prefixcmp(opt, "detect-renames")) {
|
||||
opt += strlen("detect-renames");
|
||||
} else if (!prefixcmp(opt, "find-renames")) {
|
||||
opt += strlen("find-renames");
|
||||
if (*opt == 0 || *opt++ == '=')
|
||||
cmd = 'M';
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user