Re: What's cooking in git.git (Jan 2021, #04; Sat, 16)

From: Junio C Hamano <gitster@pobox.com>
Date: Jan 21, 2021, 18:35 UTC
Message-ID: <xmqqft2ucf4p.fsf@gitster.c.googlers.com>
In-Reply-To: <CABPp-BGHpvmx-hdZ==MdODKEDVTr92m3rs4T2d_w9Aa0d0zanQ@mail.gmail.com>

Elijah Newren <newren@gmail.com> writes:

Show 17 quoted lines

> Hi Junio,
>
> On Sat, Jan 16, 2021 at 2:02 PM Junio C Hamano <gitster@pobox.com> wrote:
>> * en/merge-ort-perf (2021-01-15) 4 commits
>>  - merge-ort: begin performance work; instrument with trace2_region_* calls
>>  - Merge branch 'en/ort-directory-rename' into en/merge-ort-perf
>>  - Merge branch 'en/ort-conflict-handling' into en/merge-ort-perf
>>  - Merge branch 'en/diffcore-rename' into en/merge-ort-perf
>>  (this branch uses en/diffcore-rename, en/merge-ort-3, en/ort-conflict-handling and en/ort-directory-rename.)
>
> Any chance we could merge this down to next now?  In terms of pre-requisites:
>   * you merged en/diffcore-rename and en/merge-ort-3 to next already
> (and marked both as "Will merge to master")
>   * you previously labelled en/ort-conflict-handling as "Will merge to
> next" (and it was reviewed by Stolee[1])
>   * en/ort-directory-rename has now been reviewed by Taylor[2]
> Also, en/merge-ort-perf itself has also been reviewed by Taylor[3].

This one is a bit unfortunate in that it is so small a change by itself, but sits on top of en/ort-directory-rename.

Even though I wanted to merge the en/ort-directory-rename down to 'next' yesterday, it has just got updated and I had to rebase the ort-perf branch using the material from the old thread, so neither is in 'next' as of now. That's the cost of building on top of too many things that are in flex X-<. I'll see if I can find time today to give it the last read-over before mergint the ort-d-r in 'next' but I am not very optimistic right now.

> But I'd like a stable commit identifier to place in the '??????????'

Well, we'd all like a stable commit contents in the first place ;-)

Thanks.