git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Taylor Blau <me@ttaylorr.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: What's cooking in git.git (Dec 2022, #05; Wed, 14)
Date: Wed, 14 Dec 2022 14:46:44 -0500	[thread overview]
Message-ID: <Y5ooJJLqPP0R2SAS@nand.local> (raw)
In-Reply-To: <xmqq7cyuw9h4.fsf@gitster.g>

On Wed, Dec 14, 2022 at 07:44:23PM +0900, Junio C Hamano wrote:
> Junio C Hamano <gitster@pobox.com> writes:
>
> > In the past, I tried to re-examine all the topics in 'next' myself
> > to pick and choose the ones to be kept before rewinding and
> > rebuilding 'next' after each release, which took me a while.  This
> > time, to share the burden to expedite the process, I'll reset 'next'
> > to 'master' without any topics merged, and rely on input from list
> > participants.
> >
> > The topics that used to be in 'next' are all marked as "Will merge
> > back to 'next'", but people can tell me to give them a chance to
> > reboot their topics, instead of piling "oops, that was wrong" fixes
> > on top, while I wait for such an input for the coming days.
>
> What is involved in "re-examine to pick and choose the ones to be
> kept" was to go to the original thread (which should not be too
> hard, as Taylor has maintained the "source:" line in the report well
> during my absense) see general consensus and the reason behind the
> consensus back then still applies today.

Since it wasn't obvious to me, I figure it is worth mentioning that the
effort to maintain these source lines can be done via the "amlog" notes,
which are automatically filled in when applying new patches from the
list via your post-applypatch hook.

The relevant parts being:

  message_id="$(...)"
  if test -n "$message_id" && head=$(git rev-parse --verify HEAD 2>/dev/null)
  then
    echo "$head $message_id" >>"$GIT_DIR"/am.log &&
    (
      GIT_NOTES_REF=refs/notes/amlog
      export GIT_NOTES_REF
      git notes add -f -m "Message-Id: $message_id" "$head"
    )
  fi

I just made sure to push `refs/notes/amlog` up when doing new push-outs.
The rest (including the "source:" lines in the WC reports) was made easy
by your Meta/cook script.

Thanks,
Taylor

  reply	other threads:[~2022-12-14 19:48 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-12-14  9:59 What's cooking in git.git (Dec 2022, #05; Wed, 14) Junio C Hamano
2022-12-14 10:44 ` Junio C Hamano
2022-12-14 19:46   ` Taylor Blau [this message]
2022-12-14 15:09 ` Derrick Stolee
2022-12-14 23:50   ` Junio C Hamano
2022-12-14 19:09 ` Jeff Hostetler
2022-12-14 23:50   ` Junio C Hamano
2022-12-14 19:18 ` Jeff Hostetler
2022-12-15 22:37   ` Junio C Hamano
2022-12-15  9:14 ` ag/merge-strategies-in-c (was: What's cooking in git.git (Dec 2022, #05; Wed, 14)) Ævar Arnfjörð Bjarmason
2022-12-15 12:55   ` Phillip Wood
2022-12-15 15:32     ` Ævar Arnfjörð Bjarmason
2022-12-15 16:27       ` Phillip Wood
2022-12-15 16:29         ` Ævar Arnfjörð Bjarmason
2022-12-15  9:33 ` ab/remove--super-prefix & ab/submodule-no-abspath " Ævar Arnfjörð Bjarmason
2022-12-15  9:49 ` js/bisect-in-c " Ævar Arnfjörð Bjarmason
2022-12-15 11:55 ` What's cooking in git.git (Dec 2022, #05; Wed, 14) Sean Allred
2022-12-15 22:45 ` Junio C Hamano
2022-12-15 23:09 ` Junio C Hamano
2022-12-16 15:33 ` ds/bundle-uri-4* (was Re: What's cooking in git.git (Dec 2022, #05; Wed, 14)) Derrick Stolee
2022-12-16 22:55   ` 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

  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 \
    --in-reply-to=Y5ooJJLqPP0R2SAS@nand.local \
    --to=me@ttaylorr.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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).