Re: What's cooking in git.git (Jan 2021, #04; Sat, 16)
- From
Elijah Newren <newren@gmail.com>
- Date
- Jan 21, 2021, 16:25 UTC
- Message-ID
- <CABPp-BGHpvmx-hdZ==MdODKEDVTr92m3rs4T2d_w9Aa0d0zanQ@mail.gmail.com>
- In-Reply-To
- <xmqq8s8so84r.fsf@gitster.c.googlers.com>
Hi Junio,
On Sat, Jan 16, 2021 at 2:02 PM Junio C Hamano <gitster@pobox.com> wrote:
Show 6 quoted lines
> * 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].
I have multiple series of patches for performance, starting with a 2-patch series, where for both commit messages and cover letters I want to use paragraphs of the form:
"""
For the testcases mentioned in commit ??????????
("merge-ort: begin performance work; instrument with trace2_region_*
calls", 2020-10-28), the changes in just this series improves the
performance as follows:
Before Series After Series
no-renames: 12.975 s ± 0.037 s 12.878 s ± 0.050 s
mega-renames: 5154.338 s ± 19.139 s 1673.551 s ± 4.586 s
just-one-mega: 146.703 s ± 0.852 s 47.698 s ± 0.221 s
"""But I'd like a stable commit identifier to place in the '??????????' slot, and I think the current round of the series you pushed out last night and using commit 36d1f87d05 seems like a good such label. However, since I have so many paragraphs of this form and I don't want the labels to go stale, it'd be nice if we could merge en/merge-ort-perf down to at least next first.
[1] https://lore.kernel.org/git/5f6d5428-36ce-3e91-4916-8968ac1b8686@gmail.com/ [2] https://lore.kernel.org/git/YAdh1XTvDhRzGTiC@nand.local/ [3] https://lore.kernel.org/git/X%2FjHpZlSxwAxoUyq@nand.local/ (note that the series only has one patch)