From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS3215 2.6.0.0/16 X-Spam-Status: No, score=-0.8 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by dcvr.yhbt.net (Postfix) with ESMTP id CB6A81F4CE for ; Wed, 13 Apr 2022 23:31:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237822AbiDMXde (ORCPT ); Wed, 13 Apr 2022 19:33:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47628 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229682AbiDMXdd (ORCPT ); Wed, 13 Apr 2022 19:33:33 -0400 Received: from pb-smtp2.pobox.com (pb-smtp2.pobox.com [64.147.108.71]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 96F3424951 for ; Wed, 13 Apr 2022 16:31:10 -0700 (PDT) Received: from pb-smtp2.pobox.com (unknown [127.0.0.1]) by pb-smtp2.pobox.com (Postfix) with ESMTP id 60599128A16; Wed, 13 Apr 2022 19:31:09 -0400 (EDT) (envelope-from junio@pobox.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; s=sasl; bh=XVx1t2pOwiq2WAt9++Cnxcox7SXyh2Ct6vtbe7 CfwEY=; b=J4v3mPQRUJ7XNp3gBXxFvRKZykVdR1C+gGsW3Atdu/MjBgl7Psbplb tPHDcw0iQWDYpeu+jHC2DWbBMyzrwm4POekuZKoKySGVUcB1knhp2xjZ8EvaIE2E 3LlWsnUAkIIjvF6D5xli3KxhvO//gnmdFLIIRPrrIrAI58jd0osME= Received: from pb-smtp2.nyi.icgroup.com (unknown [127.0.0.1]) by pb-smtp2.pobox.com (Postfix) with ESMTP id 4589D128A15; Wed, 13 Apr 2022 19:31:09 -0400 (EDT) (envelope-from junio@pobox.com) Received: from pobox.com (unknown [35.185.214.157]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp2.pobox.com (Postfix) with ESMTPSA id 6D136128A14; Wed, 13 Apr 2022 19:31:08 -0400 (EDT) (envelope-from junio@pobox.com) From: Junio C Hamano To: =?utf-8?B?w4Z2YXIgQXJuZmrDtnLDsA==?= Bjarmason Cc: Bryan Turner , Git Users , Patrick Steinhardt Subject: Re: reference-transaction regression in 2.36.0-rc1 References: <220413.86r161f3qp.gmgdl@evledraar.gmail.com> Date: Wed, 13 Apr 2022 16:31:07 -0700 In-Reply-To: (Junio C. Hamano's message of "Wed, 13 Apr 2022 15:56:14 -0700") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Pobox-Relay-ID: CBB8A672-BB81-11EC-849B-CB998F0A682E-77302942!pb-smtp2.pobox.com Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Junio C Hamano writes: > Junio C Hamano 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.