Re: What's cooking in git.git (Aug 2020, #04; Tue, 18)

From: Junio C Hamano <gitster@pobox.com>
Date: Aug 19, 2020, 17:09 UTC
Message-ID: <xmqq5z9ev9zf.fsf@gitster.c.googlers.com>
In-Reply-To: <9bb7995e-4e69-00b3-eb7a-54412638cb7f@gmail.com>

Derrick Stolee <stolee@gmail.com> writes:

Show 18 quoted lines

> On 8/18/2020 6:50 PM, Junio C Hamano wrote:
>> * ds/maintenance-part-1 (2020-08-18) 11 commits
>>  - maintenance: add trace2 regions for task execution
>>  - maintenance: add auto condition for commit-graph task
>>  - maintenance: use pointers to check --auto
>>  - maintenance: create maintenance.<task>.enabled config
>>  - maintenance: take a lock on the objects directory
>>  - maintenance: add --task option
>>  - maintenance: add commit-graph task
>>  - maintenance: initialize task array
>>  - maintenance: replace run_auto_gc()
>>  - maintenance: add --quiet option
>>  - maintenance: create basic maintenance runner
>>  (this branch is used by ds/maintenance-part-2; uses jc/no-update-fetch-head; is tangled with jt/lazy-fetch.)
>
> Is this "is tangled with jt/lazy-fetch" related to the
> fact that jc/no-update-fetch-head was part of my branches,
> or are we colliding in other interesting ways?

The phrasing is unfortunate but what it wants to convey is that, when the commits that are in this topic but not in 'master', and the commits that are in the other topic but not in 'master', are compared, there is overlap. If one is a subset of the other, 'used by' and 'uses' are the words used to describe these two topics. I just picked to use 'is tangled with' when both sides have unique commits that are not in 'master'.

IOW "shares commits with X that are not in 'master'" is what I wanted to say, but has been too lazy to find a better word X-<.