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-Status: No, score=-3.1 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id 2A7131F4B4 for ; Wed, 9 Dec 2020 14:57:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733144AbgLIOzR (ORCPT ); Wed, 9 Dec 2020 09:55:17 -0500 Received: from mout.gmx.net ([212.227.17.20]:36233 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733142AbgLIOzR (ORCPT ); Wed, 9 Dec 2020 09:55:17 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1607525622; bh=7uRB1ILDCNH77CKQx3zX8wVegQnkZlfTV5wMtonNakU=; h=X-UI-Sender-Class:Date:From:To:cc:Subject:In-Reply-To:References; b=k2XjIi5ma3/ALgzWW3rlvpFTFwJ7+7B5hvP6Bu7lEuSvKgiAYkdqv0LmVvWprOkye 8DYFDZZII4WvuD8n4VmxbQ6fNnTKwzsPUzRa90puMmplYzTJYsRARJ6mdy5hnCt2Cb 8fZybp9zXeOClzV6aZ681PfV51jJGl1UXASM9tXY= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from [172.28.88.62] ([89.1.212.111]) by mail.gmx.com (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MJE6F-1kYNiA3CoN-00KgDY; Wed, 09 Dec 2020 15:53:41 +0100 Date: Wed, 9 Dec 2020 15:53:40 +0100 (CET) From: Johannes Schindelin X-X-Sender: virtualbox@gitforwindows.org To: Taylor Blau cc: Junio C Hamano , Johannes Schindelin via GitGitGadget , git@vger.kernel.org Subject: Re: [PATCH] t5310: stop expecting the default branch name `master` In-Reply-To: Message-ID: References: User-Agent: Alpine 2.21.1 (DEB 209 2017-03-23) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-Provags-ID: V03:K1:w0p6rFaMQ4wG1AEoH0w0vUdW5bTu4CLB5NcQzYQShRGsTtDhUSm GxQZGAUQ17+9MFfO9Ve4v4zglQoJG9dNpw3xOaH/Ks1bEJzStg6cqSKBE26gwHnh1f2W0O5 cl2XedUVmU9fMBpoJBQaSoi1+/+JYXo4hB6hlBw/OBgpBMl+DviwxbyLzb2ltbffiGore96 gS6LSnOYx74p9GHheUCiQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:sdhD0R+oLMk=:In/IACXohXyPde9uCfmadr D+joXUJ7WsWfnjw90Hc/DbM9DG/kM5qIfcM2bOSiNNyRl9yTlTbetoyyAEoLF34KBq/Qs3TXY l6jyDLFv7DII5BQAnlAveZy+6YS4VbbDL39AlrlwEfJMagDCmXfoK5JaUoJZ331XEnM7wr669 yd5xMKtE7LE+FgsbJWcmwDE5o/2M6XBF88AvTOF61awofHK4sTLf/OybocfjIorIkDwxIbOsU iFCSQuB+o5PQPKg5OyR9Ucqsi/VVIqb17p3DPuRostBe3E9p7q/Xedtfp5hk20EhUIanp0I9A wofNf8UOyZdeeucZXOZdFJlyHUCtJbuTVWNHCigx07+ubLodQRqLcAksnnc6h6H7/IQjL7GqC iAFKerUUDxXwskzbPlztngmr2TXEvB7lJYs4ydsK7LzIS6X/oDrvGE8U/w7sNqVKd6UGEfZ9n 5PbgF80mjVUGa/P2/zFiliAvtKhq9PZ6Rr8wi3AkjF/LUBedMNqw0SG8sXrEwOVU3WldOiTmP g5CYcdo00mGCHD9H+a+FlDjQ9OyrdFffTMPXlkCuJ7XaUA73x7rf+JaLFhQUX/eAwOfHhErJx L5n7CiY1MXhVrUhaI5rk/ETciMX46M1hDuBabTcBQWqG4BnG/RD9rOSa/86jfy5MqIWNpTai4 yFyBFakFNcepMNV6rQ4aWwTnDB58xDG3xUFu7pEv7YK4u7Sfxj5oP3f3qtf+tBuKDYoDYqtVa 6RxW37KQtIa5OSuxnyB2PIe8l3DZmTG7Ml5w0BZpT5IShnpRBqAwAzPyKXeSTmSU5G5Nlu555 9fruYq48Y0ryZaKk7iBZWbHiGyFC1b8Ep5pFpVpbUuHKiBUO+aX+DtWHUfcPvxKNkDK2JA/jF i/EX+DG8q348rFtGnAd/CRZAu3BH3U5paw/+dqXLk= Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Hi Taylor, On Tue, 8 Dec 2020, Taylor Blau wrote: > On Tue, Dec 08, 2020 at 01:13:35PM -0800, Junio C Hamano wrote: > > Taylor Blau writes: > > > > > On Mon, Dec 07, 2020 at 10:35:48AM -0800, Junio C Hamano wrote: > > >> "Johannes Schindelin via GitGitGadget" > > >> writes: > > >> > > >> > This one goes on top of tb/pack-bitmap, and requires an updat= e of > > >> > js/default-branch-name-tests-final-stretch (it no longer need= s to > > >> > hard-code GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME in t5310). > > >> > > >> As the targetted topic is not in 'next' and marked with "Needs a bi= t > > >> of reshuffling?", I'd appreciate this patch to be also forwarded so > > >> that I do not have to worry about it myself. > > > > > > Ah, sorry that I missed this before sending out v3. I was hoping tha= t > > > the fixup would be limited to one patch, but this needs to be either > > > spread across multiple patches, or applied at the end. > > > > > > Since I already sent v3, how do you want to handle this? > > > > As I have many other topics on the table to attend to, I can skip v3 > > and take v4 if it is not too much trouble to fix the issue at the > > source. Thanks. > > No problem at all. Your instructions were spot on (4/24 and 15/24 needed > adjusting, as well as the later patches which could no longer be > applied after modifying those two). > > Checking my work against upstream, I can see that the only diff lines > which mention "master" are removals: > > $ git diff @{u}.. | grep master > - git checkout master && > - bitmaptip=3D$(git rev-parse master) && > - git rev-list --count other...master >expect && > - git rev-list --use-bitmap-index --count other...master >actual && > - git --git-dir=3Dclone.git fetch origin master:master && > - git --git-dir=3Dclone.git fetch origin master:master && > > and spot checking the inter-diff between what I have and what Johannes > posted I can see that they are the same. I've added some Helped-by lines > in the relevant patches to indicate where the suggestions came from. > > v4 coming shortly... Thank you so much for picking this up! Ciao, Dscho