From nobody Sat Jul 25 00:59:09 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4h6RMn2X2Mz6n2Jj for ; Sat, 25 Jul 2026 00:59:33 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pl1-x631.google.com (mail-pl1-x631.google.com [IPv6:2607:f8b0:4864:20::631]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h6RMn240Fz49ZK for ; Sat, 25 Jul 2026 00:59:33 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pl1-x631.google.com with SMTP id d9443c01a7336-2ccf2360620so10171885ad.3 for ; Fri, 24 Jul 2026 17:59:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784941162; x=1785545962; darn=freebsd.org; h=to:references:message-id:cc:date:in-reply-to:from:subject :mime-version:content-type:from:to:cc:subject:date:message-id :reply-to:content-type; bh=AVFOdNhSZAGz2I8FwX7Aitj5wKGjIKqb9GzdJebQhJ8=; b=BY2bbpWYUpbHoxF+7rCWtTME2rHMU3vtahLeAK2g09bi19FIHkIwQfUVaY5jCslcVD gzRVVye1V+qsykoyWVJbrjUQhIlGg8rsZt+cf2k89TLbPOEOpLm2kPW+lz0OtkSZFqVl xkz1BT57o0IbPb1y3uLIKl0B1EJ+H1Dl0zLTjelEKGQFN+tMiD8qIXPNKbhiqCrGnzIx ogCmmuos2R8GBz52l5qRjXHlb8LBQvvD2pggNfjl1PoFJmtcan+fD0e+XpOXfg35Pry4 sm4Ol1O2BLLGy25u5rLp/X72Hc+W1oRb6NKV9bAHVD63qR2cCzNpjtLQ8HLIHaJvh4X7 Lrzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784941162; x=1785545962; h=to:references:message-id:cc:date:in-reply-to:from:subject :mime-version:content-type:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to:content-type; bh=AVFOdNhSZAGz2I8FwX7Aitj5wKGjIKqb9GzdJebQhJ8=; b=S5QX9yY9ea3n2SdIuKB6QSh9arNWHGd9Uqf+nmyY5oPq5XX1dlmaMuhvEQfp8Hujr7 +4lC2PKkFEr6rCCLKDH1cXq/9C86QPoWuC2I+wBPJkUu0APZNXKyc5Mk/4vl4r3rkQhw kbJzruLDEe02hA+epNuoEyuH/d18DX10srvs45TVQHQDwr2IFw6t5eZj85o6U6zcZ41k 50Eul54LL1dhqWTgNN9wHslW/pwPHCQu/nxxgSP4idZlDhWIFE/MRcUXiM0kVlLAcd25 uPw169zmJSnlvWNS6IN3KoU8KdHMMHJSn2PV3H5E4bxi701bvzj3ciFGbk52DswzHyTC Ffkg== X-Forwarded-Encrypted: i=1; AHgh+RriOs25NkWI0tDJuj6RthQj8YWCXOJUSZKrkBZNqsV5Cff86I3h+iDVb11ITjfrL6JHHulN0QHzKU6jjrwinbzaJa+Z@freebsd.org X-Gm-Message-State: AOJu0YwBsFKdWeekq5Qor+fLqcCeo0U/AWZwIkeVR2nP8rDFM18jj5Dc l3rSuf5OIvBcsrwcEdlzRJ9bbHVdtL3Yq6IibhyBC9HgsdbRj1miArRXBWz6aFCX X-Gm-Gg: AR+sD12XrEDq4MafVVDa6G5CZs2VlgP5LrFoctL1PVcSZp/4SzNmfb18Z4v15qbwZt4 6Kx3Fdlf0XA1/Q/S5nqbvQOHaWTP6D5EcWUBdlZ28QDKXgI6F5UftkQn6AhoFRZwvv4U0oJP/PD JZgDR0hUdyd+bRPNUgbwRnl5DLNynaaiz61W0M6L0uPrY1kRYCCXRm+x6qKckVZd3w5T7DKfEDH xFmuH8YSkkA6yJAQyVzRpOqNY6PcZTmVWqb0KxQNA6TPfx/sxPmxk2tXBmseaVsCr7mXaoV8MLq 7lu7FSxpLM9r4SrWmW/vzdzAHJqk5yZ//eMS9Q4SBFAuxBymcTqNod/GHZ0enfXmRxeli+8Lwlu dwXzZ/TrXUbVYwyojseeR12mhouFwamcAk6PLysek9QALRcYjrdVCaSyun4m328f7mNto06U+SP CnhRM0wN7dypjHxPn8LxJ08SiroA== X-Received: by 2002:a17:903:1b6c:b0:2ca:3e3f:4956 with SMTP id d9443c01a7336-2cfde891b9dmr5256215ad.44.1784941161937; Fri, 24 Jul 2026 17:59:21 -0700 (PDT) Received: from smtpclient.apple ([145.79.197.119]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cfde5eecf5sm2324935ad.36.2026.07.24.17.59.20 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 24 Jul 2026 17:59:20 -0700 (PDT) Content-Type: multipart/signed; boundary="Apple-Mail=_23DB1DF9-C7AE-473F-A47D-A9CB86A669D4"; protocol="application/pgp-signature"; micalg=pgp-sha256 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3864.600.51.1.1\)) Subject: Re: git: 7392dc9d2683 - main - git-mfc: Let the upstream for PRERELEASE branches be main From: "Enji Cooper (yaneurabeya)" In-Reply-To: <6a63d4fb.370de.23147404@gitrepo.freebsd.org> Date: Fri, 24 Jul 2026 17:59:09 -0700 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Message-Id: <8569B085-E920-4331-8012-420C91DB899B@gmail.com> References: <6a63d4fb.370de.23147404@gitrepo.freebsd.org> To: Mark Johnston X-Mailer: Apple Mail (2.3864.600.51.1.1) X-Rspamd-Queue-Id: 4h6RMn240Fz49ZK X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Spamd-Bar: ---- --Apple-Mail=_23DB1DF9-C7AE-473F-A47D-A9CB86A669D4 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On Jul 24, 2026, at 2:11=E2=80=AFPM, Mark Johnston = wrote: >=20 > The branch main has been updated by markj: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D7392dc9d26830fe9d19e035d2e08f19d= cca96591 >=20 > commit 7392dc9d26830fe9d19e035d2e08f19dcca96591 > Author: Mark Johnston > AuthorDate: 2026-07-24 21:09:48 +0000 > Commit: Mark Johnston > CommitDate: 2026-07-24 21:09:48 +0000 >=20 > git-mfc: Let the upstream for PRERELEASE branches be main >=20 > Such branches are in code slush but are the same as stable branches = for > the purpose of MFCs. > --- > tools/tools/git/git-mfc | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) >=20 > diff --git a/tools/tools/git/git-mfc b/tools/tools/git/git-mfc > index 45a16a3bd5e4..431ed2ebc861 100755 > --- a/tools/tools/git/git-mfc > +++ b/tools/tools/git/git-mfc > @@ -59,7 +59,7 @@ def origin_branch(): > err(1, f"could not determine BRANCH from {newvers}") > if branch =3D=3D "CURRENT": > err(1, "this is a CURRENT tree, we do not MFC to CURRENT") > - if branch =3D=3D "STABLE": > + if branch =3D=3D "STABLE" or branch =3D=3D "PRERELEASE": This is the preferred idiom: ``` if branch in (=E2=80=9CSTABLE=E2=80=9D, =E2=80=9CPREREALEASE=E2=80=9D, = ): ``` It=E2=80=99s easier to read and results in less instructions Cheers, -Enji ``` >>> import dis >>> def db1(a): ... if a =3D=3D "b" or a =3D=3D "c": ... return True ... return False =E2=80=A6 >>> def db2(a): ... if a in ("b", "c"): ... return True ... return False ... >>> dis.dis(db1) 1 RESUME 0 2 LOAD_FAST_BORROW 0 (a) LOAD_CONST 0 ('b') COMPARE_OP 88 (bool(=3D=3D)) POP_JUMP_IF_TRUE 8 (to L1) NOT_TAKEN LOAD_FAST_BORROW 0 (a) LOAD_CONST 1 ('c') COMPARE_OP 88 (bool(=3D=3D)) POP_JUMP_IF_FALSE 3 (to L2) NOT_TAKEN 3 L1: LOAD_CONST 2 (True) RETURN_VALUE 4 L2: LOAD_CONST 3 (False) RETURN_VALUE >>> dis.dis(db2) 1 RESUME 0 2 LOAD_FAST_BORROW 0 (a) LOAD_CONST 3 (('b', 'c')) CONTAINS_OP 0 (in) POP_JUMP_IF_FALSE 3 (to L1) NOT_TAKEN 3 LOAD_CONST 1 (True) RETURN_VALUE 4 L1: LOAD_CONST 2 (False) RETURN_VALUE ```= --Apple-Mail=_23DB1DF9-C7AE-473F-A47D-A9CB86A669D4 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEkHfexGRJ3gYRdA2gGpE5DjPsNJgFAmpkCl0ACgkQGpE5DjPs NJhRYBAAhEuGTohQcZmp3DaPB/SJz6KZY0MmXZpZ7CZdCIq7vSOiwKybquO5gonQ UpMMe2AZn8ydIFNEeM+/9M0tw0oJJYfse1ychYt874femanVlQYaD+MG/qspiFj0 2Rvig9uhxrRcUVxVkixE8ceI/ZwZ3vicMFStNihLJ/f0x7A3XqhVJDTIWe8yRJ6l IqRO8nXs6RLzYM/iPm7R/BUUEpcNZHFX+3z/PPOlMewAAPS/MY/ZJOOEBmtGnR9a MhC2gALI3/zKSSUmBFw/KvakuFVcdiL7JxqMo4WY6vDTKn49ripwXnq2p1kYjoFT wbvzgYHzq3EJ/qdjqxWzT3q3LyKRcvAa1Hr1lwSr9pZU4O8CXeOuI7xevatxFtrK MYaBWI3Yh3Y7es+IycattqeDF9nbOjKzaUXGeFoj6v3fay/UjA/9IBYeeVYf686/ TZp+IzoHr/OD3EeaLZwyXUnant5OmmRN+KJHpuUT5S39KWQzCYViulDcrVDqIFRG O/B4O7R5wOaIGB0vVxq5bCUp8rA/6qwA/AjL8h1oJzM0F7sXy8hPkRJ2uZxfRq1+ YKrznBuHZ+Gu8S6HLJGQJz9F6YVXlTsUAYKxBqLMmIARRo8YcwxH7oAEJY4gkORO mOyoC/NCAlZh/dUG4I+TtPaJJ5sL3wal8fi2UnUXVHjQ/lWvDMU= =sIE5 -----END PGP SIGNATURE----- --Apple-Mail=_23DB1DF9-C7AE-473F-A47D-A9CB86A669D4--