Re: What's cooking in git.git (Dec 2010, #01; Sat, 4)
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Dec 10, 2010, 21:59 UTC
- Message-ID
- <7v4oalcmqx.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <AANLkTinJu0KzXZ2Rjbs2+XH7T=Gq5MOajxo51DHtqoGZ@mail.gmail.com>
Miles Bader <miles@gnu.org> writes:
> Maybe if you renamed every option simultaneously, there would be > confusion, but seriously, it's only one option. It's not going to be > a problem.
Well, let's avoid all of that trouble before it is too late, by putting this on top of what is in 'next' and ship 1.7.4 with it.
Between "find" and "detect", I do not have much preference either way. It may sound more active to "find" them, but if told to "detect" them, git goes ahead and actively changes its internal behaviour in order to do so, which amounts to an active "find"ing anyway, so...
-- >8 -- From: Yann Dirson <ydirson@altern.org> Date: Wed, 10 Nov 2010 21:27:12 +0100 Subject: [PATCH] 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> --- Documentation/diff-options.txt | 5 ++--- diff.c | 18 +++++++++--------- 2 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 7246e10..c93124b 100644 --- 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>]:: ---detect-renames[=<n>]:: +--find-renames[=<n>]:: ifndef::git-log[] Detect renames. endif::git-log[] @@ -246,12 +246,11 @@ 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>`. --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 diff --git a/diff.c b/diff.c index dee0bd8..b5ef1ec 100644 --- 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; } - 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; } - 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) @@ -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); - 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); @@ -3380,12 +3380,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'; }
-- 1.7.3.3.710.g2d012