git: 7392dc9d2683 - main - git-mfc: Let the upstream for PRERELEASE branches be main
Date: Fri, 24 Jul 2026 21:11:23 UTC
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":
return "main"
if re.match(r'^RELEASE(-p\d+)?$', branch):
if revision is None: