From: Junio C Hamano <gitster@pobox.com>
To: Elijah Newren <newren@gmail.com>
Cc: Sam James via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org, Sam James <sam@gentoo.org>
Subject: Re: [PATCH] diff: implement config.diff.renames=copies-harder
Date: Tue, 07 Nov 2023 12:10:38 +0900 [thread overview]
Message-ID: <xmqq7cmu9s29.fsf@gitster.g> (raw)
In-Reply-To: <CABPp-BEuvjduS4JiORJybKtoPWvJd+BbbR_JAvZdj4Px_v8H4A@mail.gmail.com> (Elijah Newren's message of "Mon, 6 Nov 2023 18:45:20 -0800")
Elijah Newren <newren@gmail.com> writes:
> On Fri, Nov 3, 2023 at 4:25 AM Sam James via GitGitGadget
> <gitgitgadget@gmail.com> wrote:
>>
>> From: Sam James <sam@gentoo.org>
>>
>> This patch adds a config value for 'diff.renames' called 'copies-harder'
>> which make it so '-C -C' is in effect always passed for 'git log -p',
>> 'git diff', etc.
>>
>> This allows specifying that 'git log -p', 'git diff', etc should always act
>> as if '-C --find-copies-harder' was passed.
>>
>> I've found this especially useful for certain types of repository (like
>> Gentoo's ebuild repositories) because files are often copies of a previous
>> version.
>
> These must be very small repositories? --find-copies-harder is really
> expensive...
True. "often copies of a previous version" means that it is a
directory that has a collection of subdirectories, one for each
version? In a source tree managed in a version control system,
files are often rewritten in place from the previous version,
so I am puzzled by that justification.
It is, in the proposed log message of our commits, a bit unusual to
see "This patch does X" and "I do Y", by the way, which made my
reading hiccup a bit, but perhaps it is just me?
>> diff --git a/Documentation/config/diff.txt b/Documentation/config/diff.txt
>> index bd5ae0c3378..d2ff3c62d41 100644
>> --- a/Documentation/config/diff.txt
>> +++ b/Documentation/config/diff.txt
>> @@ -131,7 +131,8 @@ diff.renames::
>> Whether and how Git detects renames. If set to "false",
>> rename detection is disabled. If set to "true", basic rename
>> detection is enabled. If set to "copies" or "copy", Git will
>> - detect copies, as well. Defaults to true. Note that this
>> + detect copies, as well. If set to "copies-harder", Git will try harder
>> + to detect copies. Defaults to true. Note that this
>
> "try harder to detect copies" feels like an unhelpful explanation.
Yup. "will spend extra cycles to find more copies", perhaps?
next prev parent reply other threads:[~2023-11-07 3:10 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-03 11:25 [PATCH] diff: implement config.diff.renames=copies-harder Sam James via GitGitGadget
2023-11-07 2:45 ` Elijah Newren
2023-11-07 3:10 ` Junio C Hamano [this message]
2023-11-07 17:19 ` Elijah Newren
2023-11-08 1:26 ` Junio C Hamano
2023-11-08 3:30 ` Elijah Newren
2023-11-08 4:06 ` Junio C Hamano
2023-11-08 4:38 ` Elijah Newren
2024-03-11 21:42 ` Sam James
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq7cmu9s29.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=newren@gmail.com \
--cc=sam@gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).