Re: What's cooking in git.git (Nov 2022, #02; Tue, 8)

From: Taylor Blau <me@ttaylorr.com>
Date: Nov 11, 2022, 02:42 UTC
Message-ID: <Y222gnPtcQCr9IWx@nand.local>
In-Reply-To: <Y21utWxpsmXEkeIS@coredump.intra.peff.net>

On Thu, Nov 10, 2022 at 04:35:49PM -0500, Jeff King wrote:

Show 20 quoted lines

> On Tue, Nov 08, 2022 at 06:12:05PM -0500, Taylor Blau wrote:
>
> > * jk/ref-filter-parsing-bugs (2022-11-02) 2 commits
> >   (merged to 'next' on 2022-11-03 at 92c1a50548)
> >  + ref-filter: fix parsing of signatures with CRLF and no body
> >  + ref-filter: fix parsing of signatures without blank lines
> >
> >  Various tests exercising the transfer.credentialsInUrl configuration
> >  are taught to avoid making requests which require resolving localhost
> >  to reduce CI-flakiness.
> >  source: <Y2IeqOT5Ao1Qa0Zl@coredump.intra.peff.net>
>
> Hmm, this seems like the wrong description. It matches
> jk/avoid-localhost, which was merged earlier.
>
> Unfortunately, I think it has now been baked into the history via
> 15df8418a5 (Merge branch 'jk/ref-filter-parsing-bugs', 2022-11-08). But
> it might be worth trying to puzzle out how it happened (some problem
> invoking Junio's maintainer scripts, or good old fashioned human
> error?).

It is likely to be human error. When merging to 'next' for the first time (with Meta/Reintegrate -e to add descriptions), I am often copying and pasting from my personal notes on each topic.

So I probably searched for 'jk/' and landed on the wrong one without looking too hard. Oops.

Show 12 quoted lines

> > * tb/branch-delete-detached (2022-11-01) 1 commit
> >  - branch: gracefully handle '-d' on detached HEAD
> >
> >  'git branch -d' is taught to ignore failures to resolve HEAD when
> >  detached.
> >
> >  Expecting a reroll.
> >  source: <c68f4b140f2495a35c5f30bec4e2e56c246160f4.1667334672.git.me@ttaylorr.com>
>
> It looks like you picked up my re-roll here already, from:
>
>   https://lore.kernel.org/git/Y2H%2F1S3G+KeeEN%2Fl@coredump.intra.peff.net/

Thanks for the reminder. I hadn't picked it up, and I must have missed it during triage that day. I'll pick it up and start merging it down. Thanks.

Thanks, Taylor