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=-3.4 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS 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 43C7F1F910 for ; Tue, 22 Nov 2022 22:57:07 +0000 (UTC) Authentication-Results: dcvr.yhbt.net; dkim=pass (2048-bit key; unprotected) header.d=ttaylorr-com.20210112.gappssmtp.com header.i=@ttaylorr-com.20210112.gappssmtp.com header.b="Hdoht+5C"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234874AbiKVW46 (ORCPT ); Tue, 22 Nov 2022 17:56:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56694 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230365AbiKVW45 (ORCPT ); Tue, 22 Nov 2022 17:56:57 -0500 Received: from mail-il1-x132.google.com (mail-il1-x132.google.com [IPv6:2607:f8b0:4864:20::132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B409C115 for ; Tue, 22 Nov 2022 14:56:55 -0800 (PST) Received: by mail-il1-x132.google.com with SMTP id q13so2347613ild.3 for ; Tue, 22 Nov 2022 14:56:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ttaylorr-com.20210112.gappssmtp.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=CjHVb/46+T49x36k+VNAfu5Ygp99Jdc4Iqr+J2Frksw=; b=Hdoht+5CZXx0pe6U0ZUBQ+sCJJtq6gd+kLUg/DRRsxh0fRdNl3+G9oZ9u8Jk6GlZof nQccvyNFRLSXVwXfpEKFyaSXB91CjhWqVlexMEqGPQLOCSzLJ4QrpEWyHn3QlZi0K2I4 oMhHrAXnJhab2rDTMHz4SXaCfyWaRJ0AV6HQq9lWjAIiOMXBMWLTHxJKkmae4kehtyIy feoQkuoxMPMqjDH1VYJ8uVDi6kfk67cHcHrwxayb9g9RW9RMjWC6Dfx92C+vZ/CNiTSZ nSZkqN4nUxyyMbrU6XZzFIYhwZ6M9P32yvuhME9SU85PHz/5+X5y8ChtC/OJKyRcHU3Z Ybqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=CjHVb/46+T49x36k+VNAfu5Ygp99Jdc4Iqr+J2Frksw=; b=2I62EfRu1ppBxH7Yk13LxuqniKZsiWrZyBkmZfMw0Xce4CLXJPumakknYZOw+oz+uP ZTXr27gpYzQyXksRqRPYQulrJit5xSqRh1k/YzpVQsVJHsEDrbt5d6TNrvwGSZbsrOrf YaUgt3VQ1Ia6uW8LK/UHVfLlLrTN0ZhSjnuhPh6XnMiB1TE85IgcRh682A1NHXvgV0YV xBtYWBSqxUnlN0zJ6J7F7FcVdpKRCCpRPap42BdJEslBvSruvttAuBlElCL8zeT94xOA 8BHMgHMFLsbdXQwPHTQh9NsyHmSafGVURSRp822QmUuYEY/ZURpTxhM2TRJ74dgCuX2U I+aA== X-Gm-Message-State: ANoB5pne2atBg9aLBodMlxk32nwJTmqQiox/agdEI1LbrrCCChX1R2Uo HVccgOe6eI03f9en18WAnhKCj2MYiPv1OQ== X-Google-Smtp-Source: AA0mqf5li2iR8nztIfdKZJhwOHVMQ4qU9U9OVPGU2/Ry3m8GBjTYo+9fSgq04OVzDZvOK3rJx83usQ== X-Received: by 2002:a92:ddc4:0:b0:2ff:daa8:dbbe with SMTP id d4-20020a92ddc4000000b002ffdaa8dbbemr6158388ilr.14.1669157815022; Tue, 22 Nov 2022 14:56:55 -0800 (PST) Received: from localhost (104-178-186-189.lightspeed.milwwi.sbcglobal.net. [104.178.186.189]) by smtp.gmail.com with ESMTPSA id b2-20020a92ce02000000b00302aa2a202dsm4588111ilo.64.2022.11.22.14.56.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Nov 2022 14:56:54 -0800 (PST) Date: Tue, 22 Nov 2022 17:56:52 -0500 From: Taylor Blau To: Junio C Hamano Cc: Taylor Blau , git@vger.kernel.org Subject: Re: What's cooking in git.git (Nov 2022, #04; Fri, 18) Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On Mon, Nov 21, 2022 at 12:36:36PM +0900, Junio C Hamano wrote: > Taylor Blau writes: > > > On Mon, Nov 21, 2022 at 08:24:21AM +0900, Junio C Hamano wrote: > >> Taylor Blau writes: > >> > >> > * ab/various-leak-fixes (2022-11-08) 18 commits > >> > (merged to 'next' on 2022-11-18 at 8828bb7161) > >> > ... > >> > (this branch is used by ab/merge-index-prep.) > >> > >> > * pw/rebase-no-reflog-action (2022-11-09) 2 commits > >> > (merged to 'next' on 2022-11-14 at 790dadc8d3) > >> > ... > >> > (this branch is used by ab/merge-index-prep.) > >> > >> The other topic referred to is not described anywhere, and not part > >> of 'seen'. Intended? > > > > It was merged intentionally via 790dadc8d3 (Merge branch > > 'pw/rebase-no-reflog-action' into next, 2022-11-14) as you note, though > > I'm not sure why the description from 790dadc8d3 didn't make it into the > > WC report. > > > > In any case, the description I went with is: > > > > Avoid setting GIT_REFLOG_ACTION to improve readability of the > > sequencer internals. > > Sorry, but the question was about ab/merge-index-prep that does not > exist in the report and not in 'seen'. > > For now, I'll ignore that phantom user of these two topics. It can > come back when dust settles ;-). Ah, yes, I remember this topic. It's from [1], and it does indeed use ab/various-leak-fixes and pw/rebase-no-reflog-action (cf. [2]), which apparently isn't quite sufficient (cf. [3]). If I recall correctly, it had some conflicts when queuing, so I punted on it (because at the time when [2] was written the correct base(s) were not known). Thanks, Taylor [1]: https://lore.kernel.org/git/cover-v9-00.12-00000000000-20221118T110058Z-avarab@gmail.com/ [2]: https://lore.kernel.org/git/Y3gVekgT7jLibjWo@nand.local/ [3]: https://lore.kernel.org/git/221119.86o7t3ds49.gmgdl@evledraar.gmail.com/