From: Junio C Hamano <gitster@pobox.com>
To: Elijah Newren <newren@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>,
Taylor Blau <me@ttaylorr.com>, Derrick Stolee <stolee@gmail.com>
Subject: Re: What's cooking in git.git (Jan 2021, #04; Sat, 16)
Date: Thu, 21 Jan 2021 10:35:18 -0800 [thread overview]
Message-ID: <xmqqft2ucf4p.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <CABPp-BGHpvmx-hdZ==MdODKEDVTr92m3rs4T2d_w9Aa0d0zanQ@mail.gmail.com> (Elijah Newren's message of "Thu, 21 Jan 2021 08:25:33 -0800")
Elijah Newren <newren@gmail.com> writes:
> 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.
next prev parent reply other threads:[~2021-01-21 18:37 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-16 21:59 What's cooking in git.git (Jan 2021, #04; Sat, 16) Junio C Hamano
2021-01-21 16:25 ` Elijah Newren
2021-01-21 18:35 ` Junio C Hamano [this message]
2021-01-24 5:27 ` Elijah Newren
2021-01-24 7:03 ` Junio C Hamano
2021-01-24 7:10 ` Elijah Newren
2021-01-21 18:34 ` Jonathan Tan
2021-01-21 21:05 ` Jeff King
2021-01-21 23:10 ` Junio C Hamano
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=xmqqft2ucf4p.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=me@ttaylorr.com \
--cc=newren@gmail.com \
--cc=stolee@gmail.com \
/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).