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

diff: use "find" instead of "detect" as prefix for long forms of -M and -C

Browse Source 
It is more consistent with existing --find-copies-harder; luckily "detect"
variant has not appeared in any officially released version of git.

Signed-off-by: Yann Dirson <ydirson@altern.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Yann Dirson 2010-11-10 21:27:12 +01:00 committed by Junio C Hamano
parent 150a5daad0
commit f611ddc774
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Documentation/diff-options.txt
View File

@ -230,7 +230,7 @@ eligible for being picked up as a possible source of a rename to
another file. another file.
-M[<n>]:: -M[<n>]::
--detect-renames[=<n>]:: --find-renames[=<n>]::
ifndef::git-log[] ifndef::git-log[]
Detect renames. Detect renames.
endif::git-log[] endif::git-log[]
@ -246,12 +246,11 @@ endif::git-log[]
hasn't changed. hasn't changed.
-C[<n>]:: -C[<n>]::
--detect-copies[=<n>]:: --find-copies[=<n>]::
Detect copies as well as renames. See also `--find-copies-harder`. Detect copies as well as renames. See also `--find-copies-harder`.
If `n` is specified, it has the same meaning as for `-M<n>`. If `n` is specified, it has the same meaning as for `-M<n>`.
--find-copies-harder:: --find-copies-harder::
--detect-copies-harder::
For performance reasons, by default, `-C` option finds copies only For performance reasons, by default, `-C` option finds copies only
if the original file of the copy was modified in the same if the original file of the copy was modified in the same
changeset. This flag makes the command changeset. This flag makes the command

18
diff.c
View File

@ -3150,14 +3150,14 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac)
if ((options->break_opt = diff_scoreopt_parse(arg)) == -1) if ((options->break_opt = diff_scoreopt_parse(arg)) == -1)
return -1; return -1;
} }
else if (!prefixcmp(arg, "-M") || !prefixcmp(arg, "--detect-renames=") || else if (!prefixcmp(arg, "-M") || !prefixcmp(arg, "--find-renames=") ||
!strcmp(arg, "--detect-renames")) { !strcmp(arg, "--find-renames")) {
if ((options->rename_score = diff_scoreopt_parse(arg)) == -1) if ((options->rename_score = diff_scoreopt_parse(arg)) == -1)
return -1; return -1;
options->detect_rename = DIFF_DETECT_RENAME; options->detect_rename = DIFF_DETECT_RENAME;
} }
else if (!prefixcmp(arg, "-C") || !prefixcmp(arg, "--detect-copies=") || else if (!prefixcmp(arg, "-C") || !prefixcmp(arg, "--find-copies=") ||
!strcmp(arg, "--detect-copies")) { !strcmp(arg, "--find-copies")) {
if (options->detect_rename == DIFF_DETECT_COPY) if (options->detect_rename == DIFF_DETECT_COPY)
DIFF_OPT_SET(options, FIND_COPIES_HARDER); DIFF_OPT_SET(options, FIND_COPIES_HARDER);
if ((options->rename_score = diff_scoreopt_parse(arg)) == -1) if ((options->rename_score = diff_scoreopt_parse(arg)) == -1)
@ -3194,7 +3194,7 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac)
DIFF_OPT_SET(options, TEXT); DIFF_OPT_SET(options, TEXT);
else if (!strcmp(arg, "-R")) else if (!strcmp(arg, "-R"))
DIFF_OPT_SET(options, REVERSE_DIFF); DIFF_OPT_SET(options, REVERSE_DIFF);
else if (!strcmp(arg, "--find-copies-harder") || !strcmp(arg, "--detect-copies-harder")) else if (!strcmp(arg, "--find-copies-harder"))
DIFF_OPT_SET(options, FIND_COPIES_HARDER); DIFF_OPT_SET(options, FIND_COPIES_HARDER);
else if (!strcmp(arg, "--follow")) else if (!strcmp(arg, "--follow"))
DIFF_OPT_SET(options, FOLLOW_RENAMES); DIFF_OPT_SET(options, FOLLOW_RENAMES);
@ -3380,12 +3380,12 @@ static int diff_scoreopt_parse(const char *opt)
opt += strlen("break-rewrites"); opt += strlen("break-rewrites");
if (*opt == 0 || *opt++ == '=') if (*opt == 0 || *opt++ == '=')
cmd = 'B'; cmd = 'B';
} else if (!prefixcmp(opt, "detect-copies")) { } else if (!prefixcmp(opt, "find-copies")) {
opt += strlen("detect-copies"); opt += strlen("find-copies");
if (*opt == 0 || *opt++ == '=') if (*opt == 0 || *opt++ == '=')
cmd = 'C'; cmd = 'C';
} else if (!prefixcmp(opt, "detect-renames")) { } else if (!prefixcmp(opt, "find-renames")) {
opt += strlen("detect-renames"); opt += strlen("find-renames");
if (*opt == 0 || *opt++ == '=') if (*opt == 0 || *opt++ == '=')
cmd = 'M'; cmd = 'M';
} }