Date: Fri, 24 Jul 2026 17:59:09 -0700 From: "Enji Cooper (yaneurabeya)" <yaneurabeya@gmail.com> To: Mark Johnston <markj@FreeBSD.org> Cc: "src-committers@freebsd.org" <src-committers@FreeBSD.org>, "dev-commits-src-all@freebsd.org" <dev-commits-src-all@FreeBSD.org>, "dev-commits-src-main@freebsd.org" <dev-commits-src-main@FreeBSD.org> Subject: Re: git: 7392dc9d2683 - main - git-mfc: Let the upstream for PRERELEASE branches be main Message-ID: <8569B085-E920-4331-8012-420C91DB899B@gmail.com> In-Reply-To: <6a63d4fb.370de.23147404@gitrepo.freebsd.org>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] > On Jul 24, 2026, at 2:11 PM, Mark Johnston <markj@FreeBSD.org> wrote: > > The branch main has been updated by markj: > > URL: https://cgit.FreeBSD.org/src/commit/?id=7392dc9d26830fe9d19e035d2e08f19dcca96591 > > commit 7392dc9d26830fe9d19e035d2e08f19dcca96591 > Author: Mark Johnston <markj@FreeBSD.org> > AuthorDate: 2026-07-24 21:09:48 +0000 > Commit: Mark Johnston <markj@FreeBSD.org> > CommitDate: 2026-07-24 21:09:48 +0000 > > git-mfc: Let the upstream for PRERELEASE branches be main > > 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(-) > > 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 == "CURRENT": > err(1, "this is a CURRENT tree, we do not MFC to CURRENT") > - if branch == "STABLE": > + if branch == "STABLE" or branch == "PRERELEASE": This is the preferred idiom: ``` if branch in (“STABLE”, “PREREALEASE”, ): ``` It’s easier to read and results in less instructions Cheers, -Enji ``` >>> import dis >>> def db1(a): ... if a == "b" or a == "c": ... return True ... return False … >>> 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(==)) POP_JUMP_IF_TRUE 8 (to L1) NOT_TAKEN LOAD_FAST_BORROW 0 (a) LOAD_CONST 1 ('c') COMPARE_OP 88 (bool(==)) 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 ``` [-- Attachment #2 --] -----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-----home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?8569B085-E920-4331-8012-420C91DB899B>