Re: What's cooking in git.git (Jun 2019, #02; Thu, 6)

From: Junio C Hamano <gitster@pobox.com>
Date: Jun 12, 2019, 17:48 UTC
Message-ID: <xmqq5zpak83i.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <a958e78b-523a-5578-24dc-77597a77c724@gmail.com>

Derrick Stolee <stolee@gmail.com> writes:

Show 5 quoted lines

>>  (this branch uses ds/commit-graph-write-refactor; is tangled with ds/close-object-store.)
>
> Sorry for the tangle here. I'll place the proper use of
> close_commit_graph(struct raw_object_store *) into my changes
> in the next version.

FWIW, "tangled" is no bad thing. Two topics that build on the mainline could be in one of these three kinds of relationship:

 - independent, sharing no commits, or
 - one builds on top of the entirety of the other, or
 - share some commits but neither is a subset of the other.

and "is tangled" was, even though I didn't really like it, the best phrase I found to describe the third kind when I wrote the script that manages the "What's cooking" report.

Thanks.