From: Taylor Blau <email@example.com>
To: Jeff King <firstname.lastname@example.org>
Cc: Taylor Blau <email@example.com>, firstname.lastname@example.org
Subject: Re: What's cooking in git.git (Nov 2022, #02; Tue, 8)
Date: Thu, 10 Nov 2022 21:42:10 -0500 [thread overview]
Message-ID: <Y222gnPtcQCr9IWx@nand.local> (raw)
On Thu, Nov 10, 2022 at 04:35:49PM -0500, Jeff King wrote:
> 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
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.
> > * 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: <email@example.com>
> It looks like you picked up my re-roll here already, from:
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.
next prev parent reply other threads:[~2022-11-11 2:48 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-08 23:12 What's cooking in git.git (Nov 2022, #02; Tue, 8) Taylor Blau
2022-11-10 21:35 ` Jeff King
2022-11-11 2:42 ` Taylor Blau [this message]
2022-11-12 14:40 ` Philip Oakley
2022-11-13 5:05 ` Taylor Blau
2022-11-13 5:08 ` Taylor Blau
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:
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
* 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.
Code repositories for project(s) associated with this public inbox
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 read-only IMAP folder(s) and NNTP newsgroup(s).