git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: Bryan Turner <bturner@atlassian.com>,
	Git Users <git@vger.kernel.org>, Patrick Steinhardt <ps@pks.im>
Subject: Re: reference-transaction regression in 2.36.0-rc1
Date: Wed, 13 Apr 2022 16:31:07 -0700	[thread overview]
Message-ID: <xmqq7d7s5zno.fsf@gitster.g> (raw)
In-Reply-To: <xmqqbkx4619t.fsf@gitster.g> (Junio C. Hamano's message of "Wed, 13 Apr 2022 15:56:14 -0700")

Junio C Hamano <gitster@pobox.com> writes:

> Junio C Hamano <gitster@pobox.com> writes:
>
>> Reverting the merge 991b4d47f0a as a whole is an option.  It might
>> be the safest thing to do, if we do not to want to extend the cycle
>> and add a few more -rc releases before the final.
>
> It turns out that this involves nontrivial amount of work to get
> right, as the bottom commit of Patrick's "fetch --atomic" series
> wants to count how many transaction we make, instead of ensuring
> that the updates to the references are all-or-none, so at least
> 2a0cafd4 (fetch: increase test coverage of fetches, 2022-02-17)
> needs to be reverted as well.  This in turn is made unnecessarily
> more cumbersome as the history in the t/ directory is littered with
> unrelated "clean-up" patches since these topics were merged.

I have a tentative revert of the merge and also the "fetch --atomic"
test that (unnecessarily) counted the number of transactions directly
on top of planned 'master', which merges the planned v2.35.3 into
v2.36-rc2 and pushed it as if it were the 'seen' branch.

The CI job https://github.com/git/git/actions/runs/2164208587 seems
to be doing well so far, so once the dust from releasing v2.30.4,
v2.31.3, v2.32.2, v2.33.3, v2.34.3, and v2.35.3 with Derrick's
hotfix for yesterday's CVE fix, I may merge it down to 'master'
before the final.

Thanks.



  reply	other threads:[~2022-04-13 23:31 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-04-12  9:20 reference-transaction regression in 2.36.0-rc1 Bryan Turner
2022-04-12 20:53 ` Bryan Turner
2022-04-13 14:34   ` Ævar Arnfjörð Bjarmason
2022-04-13 16:21     ` René Scharfe
2022-04-13 19:52     ` Junio C Hamano
2022-04-13 22:44       ` Junio C Hamano
2022-04-13 22:55         ` Bryan Turner
2022-04-13 22:56         ` Junio C Hamano
2022-04-13 23:31           ` Junio C Hamano [this message]
2022-04-15  2:37       ` Bryan Turner
2022-04-15 13:27         ` Ævar Arnfjörð Bjarmason
2022-04-15 16:53           ` Junio C Hamano
     [not found]             ` <CAJDSCnOUQm-doY-xTobPk64oeiSsTd+vSFzsb_cz9BLORAxXGA@mail.gmail.com>
2022-04-27 11:05               ` Patrick Steinhardt
     [not found]                 ` <CAJDSCnM767fdo6qy085jc9sqezvbBqDD4ikXz1y5tHEjSYED2A@mail.gmail.com>
2022-05-02 11:12                   ` Patrick Steinhardt

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=xmqq7d7s5zno.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=avarab@gmail.com \
    --cc=bturner@atlassian.com \
    --cc=git@vger.kernel.org \
    --cc=ps@pks.im \
    /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).