From nobody Fri Jul 24 21:11:23 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 4h6LJX20LZz6mkhQ for ; Fri, 24 Jul 2026 21:11:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h6LJW63Z9z3fdS for ; Fri, 24 Jul 2026 21:11:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784927483; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UCsC23FiC4zwRUQlrNhrHpC3nI+fx4myCiYIDlnZ0Uk=; b=EJJoUCw2UEo2nZdblQ3JH6aa4uFFQthMQS6TG3UJcgXmKbW1dktndXa5+Zz4iyDe5EoyTV n1xGjG2d5XXT3BrC82DR1Z0dE1YJLdb+bfuAJRkJHsu2w4VBXmtwNA6181YJPauCFu2WAZ yIMMXFf4xWvOw9T20sxqC74iRbl1z2m+cJQOnioUcI21PJzXOzL1uEUHmCAjqPSfRR8M5i AN0VsZPaQ1SL45OBolP6KX2L5+q9yTC68J7DHEUhYZbRs15nh4XmK4LIS5O5FUHZBlj2Iy jc6nh3pbqSmuHR6768rzmyEqf05KaM8e5dCUZw4F6RkEBMtHJOs8dWNvj5AHGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784927483; a=rsa-sha256; cv=none; b=OiYi9PYuOAtM7uWeSXHFzZ0AH8KZPDTC0HdQHJ1CHds0TRaKqqCqkytWA3iY/v/fKBtxQb +UTj3iXJ7/Q/e18lY0wvUoADR7R7xmZ8ljEk4VXB9dMLLBTHaVjG1RaOv8N1SA8kmGUKu2 HUXC/tuf044Gdv8xEuboR+WhS/iViKl6XdwmlfO3nHCcnjoEtWlb2TVPSuZKO8B5j6Wgp7 BnjqkfXGEhFBkltYnZDbd1aadYJT/k0Ceuffjn69FEw6zU3mfgYQeakqwrZj38XcqakBwD OTpzydILxpEF8uXdwTw1My+bttmBFmk7T4YZ8j2wm4rns4HHYAeR+292zBrZkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784927483; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UCsC23FiC4zwRUQlrNhrHpC3nI+fx4myCiYIDlnZ0Uk=; b=oG1dTwXCRf5/xq55bXD+qTlakjr+ZuTzaujRYhOj6XBflKfxZ+mIsTKBDTsmCEs1Cka3hg KS6ezvRJV2X3C7qj3jW3CL3CS6rV3PUiiKmtfUuRNGWT2a10BDm1OOo2PixZA/JXl/DWsU oLNHBlCWFBJ9dh/A4W1nmWJ0+NG/odI+eCT9rGZ1tEGAmQo9f9OHfXlGBjo3oZh4/pvB5H 4om26xjz9AX0l+23M6gU+56DAdoe2a2Kf719CjulIhIsWepiFM7gsYuXvMDl1vhaP9kFy7 pkitxxyLkWAFoRWgIFuY/v2byFrz++V/Nu7EH+23C/BCbAZ/CmbzRqWFh55CAw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h6LJW4VtWz17Ch for ; Fri, 24 Jul 2026 21:11:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 370de by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 24 Jul 2026 21:11:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 7392dc9d2683 - main - git-mfc: Let the upstream for PRERELEASE branches be main 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 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7392dc9d26830fe9d19e035d2e08f19dcca96591 Auto-Submitted: auto-generated Date: Fri, 24 Jul 2026 21:11:23 +0000 Message-Id: <6a63d4fb.370de.23147404@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7392dc9d26830fe9d19e035d2e08f19dcca96591 commit 7392dc9d26830fe9d19e035d2e08f19dcca96591 Author: Mark Johnston AuthorDate: 2026-07-24 21:09:48 +0000 Commit: Mark Johnston 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": return "main" if re.match(r'^RELEASE(-p\d+)?$', branch): if revision is None: