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

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>

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 7246e10d3eaae90943608f6df95b7dd2c6d45ebc..c93124be79809e36d9a29fd69ce77cd7f22413e1 100644 (file)
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -230,7 +230,7 @@ eligible for being picked up as a possible source of a rename to
 another file.
 
 -M[<n>]::
 another file.
 
 -M[<n>]::

---detect-renames[=<n>]::
+--find-renames[=<n>]::

 ifndef::git-log[]
        Detect renames.
 endif::git-log[]
 ifndef::git-log[]
        Detect renames.
 endif::git-log[]


@@ -246,12 +246,11 @@ endif::git-log[]
        hasn't changed.
 
 -C[<n>]::
        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>`.
 
 --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>`.
 
 --find-copies-harder::

---detect-copies-harder::

        For performance reasons, by default, `-C` option finds copies only
        if the original file of the copy was modified in the same
        changeset.  This flag makes the command
        For performance reasons, by default, `-C` option finds copies only
        if the original file of the copy was modified in the same
        changeset.  This flag makes the command

diff --git a/diff.c b/diff.c
index dee0bd8f4efc9927a8adfe249f97bdcfb1927715..b5ef1ec55e2d6a97ab00d5692a93affb66803a31 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -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)
                        return -1;
        }
                if ((options->break_opt = diff_scoreopt_parse(arg)) == -1)
                        return -1;
        }

-       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 -1;
                options->detect_rename = DIFF_DETECT_RENAME;
        }
                if ((options->rename_score = diff_scoreopt_parse(arg)) == -1)
                        return -1;
                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)
                if (options->detect_rename == DIFF_DETECT_COPY)
                        DIFF_OPT_SET(options, FIND_COPIES_HARDER);
                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);
        else if (!strcmp(arg, "-R"))
                DIFF_OPT_SET(options, REVERSE_DIFF);
                DIFF_OPT_SET(options, TEXT);
        else if (!strcmp(arg, "-R"))
                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);
        else if (!strcmp(arg, "--follow"))
                DIFF_OPT_SET(options, FOLLOW_RENAMES);
                DIFF_OPT_SET(options, FIND_COPIES_HARDER);
        else if (!strcmp(arg, "--follow"))
                DIFF_OPT_SET(options, FOLLOW_RENAMES);


@@ -3380,12 +3380,12 @@ static int diff_scoreopt_parse(const char *opt)
                        opt += strlen("break-rewrites");
                        if (*opt == 0 || *opt++ == '=')
                                cmd = 'B';
                        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';
                        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';
                }
                        if (*opt == 0 || *opt++ == '=')
                                cmd = 'M';
                }