From: Derrick Stolee <stolee@gmail.com>
To: Elijah Newren <newren@gmail.com>
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Derrick Stolee via GitGitGadget" <gitgitgadget@gmail.com>,
"Git Mailing List" <git@vger.kernel.org>,
"Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
"Jeff King" <peff@peff.net>, "Jakub Narebski" <jnareb@gmail.com>,
"Nguyễn Thái Ngọc" <pclouds@gmail.com>,
carenas@gmail.com, "Ævar Arnfjörð" <avarab@gmail.com>,
"Derrick Stolee" <dstolee@microsoft.com>
Subject: Re: [PATCH v3 5/5] repo-settings: create feature.experimental setting
Date: Thu, 8 Aug 2019 16:49:54 -0400 [thread overview]
Message-ID: <1a2bf8e1-5cc1-c626-9dfc-dd6dc58fa0ad@gmail.com> (raw)
In-Reply-To: <CABPp-BGo5spDbk34YwAPGqT1Xgsr1dHm6OhxY1xKFQxQaotBig@mail.gmail.com>
On 8/8/2019 4:31 PM, Elijah Newren wrote:
> On Thu, Aug 8, 2019 at 12:12 PM Derrick Stolee <stolee@gmail.com> wrote:
>>
>> On 8/8/2019 2:59 PM, Junio C Hamano wrote:
>>> Elijah Newren <newren@gmail.com> writes:
>>>
>>>>> --- a/Documentation/config/merge.txt
>>>>> +++ b/Documentation/config/merge.txt
>>>>> @@ -54,7 +54,8 @@ merge.directoryRenames::
>>>>> moved into the new directory. If set to "conflict", a conflict
>>>>> will be reported for such paths. If merge.renames is false,
>>>>> merge.directoryRenames is ignored and treated as false. Defaults
>>>>> - to "conflict".
>>>>> + to "conflict" unless `feature.experimental` is enabled and the
>>>>> + default is "true".
>>>>
>>>> I have a hard time parsing that changed sentence. Perhaps something like:
>>>> ...unless `feature.experimental` is enabled in which case the
>>>> default is "true".
>>>> ?
>>>
>>> That reads better.
>>>
>>> But I am not sure about the wisdom of controlling between conflict
>>> and true with this feature macro in the first place.
>>>
>>> Between "conflict" and "true", the former forces the end user to
>>> verify (or allows the end user to veto) the auto resolution by the
>>> heuristics and is always a safer if more cumbersome option. It's
>>> not like blindly trusting the directory rename heuristics is the
>>> bright future for all users, is it?
>>>
>>> I would not set rerere.autoUpdate to true when feature.experimental
>>> is set; for exactly the same reason, I do not find it reasonable to
>>> set this to true with feature.experimental macro.
>>
>> OK. I can remove it from the feature.experimental variable.
>>
>> Shall I keep the enum logic and the use of repo-settings.c? I can split
>> them out into a separate patch.
>
> Good question. In part, I was looking at this ds/feature-macros
> series because my cleanup-merge-api series[1] has some minor conflicts
> with it. I'm a little unsure what route I should take with my series
> now. Some choices:
> * keep this logic in your series in a separate patch, and have me
> rebase my series on yours.
> * drop this logic from your series since it may not be needed
> anymore, making our two series independent again.
> * move this logic into a separate patch of yours but making that
> patch part of my series instead; that'd be easy with the enum logic,
> but the repo-settings.c stuff appears to depend on your other
> patches...
>
> Thoughts or preferences?
I've done the work in my GGG PR [1] to split the commit into two,
with the merge.directoryRenames on top. I created a tag [2] at that
commit and I'll send my v4 without changes to merge.directoryRenames.
I'll let you decide if you like placing the config in repo-settings
or not (or want to adapt the enum logic in a different place).
Thanks,
-Stolee
[1] https://github.com/gitgitgadget/git/pull/292
[2] https://github.com/derrickstolee/git/releases/tag/merge.directoryRenames
next prev parent reply other threads:[~2019-08-08 20:49 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-22 17:54 [PATCH 0/5] Create 'feature.*' config area and some centralized config parsing Derrick Stolee via GitGitGadget
2019-07-22 17:54 ` [PATCH 1/5] repo-settings: consolidate some config settings Derrick Stolee via GitGitGadget
2019-07-23 13:12 ` Johannes Schindelin
2019-07-22 17:54 ` [PATCH 2/5] repo-settings: add feature.manyCommits setting Derrick Stolee via GitGitGadget
2019-07-23 14:53 ` Johannes Schindelin
2019-07-24 10:41 ` Derrick Stolee
2019-07-22 17:54 ` [PATCH 4/5] repo-settings: create feature.manyFiles setting Derrick Stolee via GitGitGadget
2019-07-22 17:54 ` [PATCH 3/5] repo-settings: parse core.untrackedCache Derrick Stolee via GitGitGadget
2019-07-23 15:04 ` Johannes Schindelin
2019-07-24 19:27 ` Derrick Stolee
2019-07-22 17:54 ` [PATCH 5/5] repo-settings: create feature.experimental setting Derrick Stolee via GitGitGadget
2019-07-23 15:20 ` Johannes Schindelin
2019-07-25 1:47 ` Derrick Stolee
2019-07-25 2:23 ` [PATCH v2 0/5] Create 'feature.*' config area and some centralized config parsing Derrick Stolee via GitGitGadget
2019-07-25 2:23 ` [PATCH v2 2/5] repo-settings: add feature.manyCommits setting Derrick Stolee via GitGitGadget
2019-07-25 2:23 ` [PATCH v2 1/5] repo-settings: consolidate some config settings Derrick Stolee via GitGitGadget
2019-07-25 9:30 ` Johannes Schindelin
2019-07-25 2:23 ` [PATCH v2 3/5] repo-settings: parse core.untrackedCache Derrick Stolee via GitGitGadget
2019-07-25 9:36 ` Johannes Schindelin
2019-07-25 2:23 ` [PATCH v2 4/5] repo-settings: create feature.manyFiles setting Derrick Stolee via GitGitGadget
2019-07-25 2:23 ` [PATCH v2 5/5] repo-settings: create feature.experimental setting Derrick Stolee via GitGitGadget
2019-07-25 9:40 ` [PATCH v2 0/5] Create 'feature.*' config area and some centralized config parsing Johannes Schindelin
2019-07-30 19:35 ` [PATCH v3 " Derrick Stolee via GitGitGadget
2019-07-30 19:35 ` [PATCH v3 1/5] repo-settings: consolidate some config settings Derrick Stolee via GitGitGadget
2019-07-30 20:47 ` Junio C Hamano
2019-07-30 19:35 ` [PATCH v3 2/5] repo-settings: add feature.manyCommits setting Derrick Stolee via GitGitGadget
2019-07-30 20:57 ` Junio C Hamano
2019-07-31 13:17 ` Johannes Schindelin
2019-07-31 15:48 ` Junio C Hamano
2019-07-31 15:01 ` Ævar Arnfjörð Bjarmason
2019-08-01 18:27 ` Derrick Stolee
2019-07-30 19:35 ` [PATCH v3 4/5] repo-settings: create feature.manyFiles setting Derrick Stolee via GitGitGadget
2019-07-30 19:35 ` [PATCH v3 3/5] repo-settings: parse core.untrackedCache Derrick Stolee via GitGitGadget
2019-07-30 19:35 ` [PATCH v3 5/5] repo-settings: create feature.experimental setting Derrick Stolee via GitGitGadget
2019-08-08 18:34 ` Elijah Newren
2019-08-08 18:48 ` Derrick Stolee
2019-08-08 18:59 ` Junio C Hamano
2019-08-08 19:12 ` Derrick Stolee
2019-08-08 20:31 ` Elijah Newren
2019-08-08 20:49 ` Derrick Stolee [this message]
2019-08-08 19:19 ` Elijah Newren
2019-08-08 20:07 ` Junio C Hamano
2019-08-08 20:46 ` Derrick Stolee
2019-08-13 18:37 ` [PATCH v4 0/6] Create 'feature.*' config area and some centralized config parsing Derrick Stolee via GitGitGadget
2019-08-13 18:37 ` [PATCH v4 1/6] repo-settings: consolidate some config settings Derrick Stolee via GitGitGadget
2019-08-13 18:37 ` [PATCH v4 3/6] commit-graph: turn on commit-graph by default Derrick Stolee via GitGitGadget
2021-09-20 0:42 ` Junio C Hamano
2021-09-20 1:22 ` Ævar Arnfjörð Bjarmason
2021-09-20 1:25 ` brian m. carlson
2021-09-20 12:53 ` Phillip Wood
2021-09-20 13:30 ` Ævar Arnfjörð Bjarmason
2021-09-20 18:00 ` Phillip Wood
2021-09-20 19:18 ` Jeff King
2019-08-13 18:37 ` [PATCH v4 2/6] t6501: use 'git gc' in quiet mode Derrick Stolee via GitGitGadget
2019-08-13 18:37 ` [PATCH v4 4/6] repo-settings: parse core.untrackedCache Derrick Stolee via GitGitGadget
2019-08-13 18:37 ` [PATCH v4 5/6] repo-settings: create feature.manyFiles setting Derrick Stolee via GitGitGadget
2019-08-13 18:37 ` [PATCH v4 6/6] repo-settings: create feature.experimental setting Derrick Stolee via GitGitGadget
2019-08-13 21:04 ` [PATCH v4 0/6] Create 'feature.*' config area and some centralized config parsing Junio C Hamano
2019-08-13 21:08 ` Junio C Hamano
2019-08-14 10:32 ` Derrick Stolee
2019-08-14 10:38 ` Derrick Stolee
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1a2bf8e1-5cc1-c626-9dfc-dd6dc58fa0ad@gmail.com \
--to=stolee@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=avarab@gmail.com \
--cc=carenas@gmail.com \
--cc=dstolee@microsoft.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=jnareb@gmail.com \
--cc=newren@gmail.com \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).