diff options
| author | Mark Johnston <markj@FreeBSD.org> | 2026-07-24 21:09:48 +0000 |
|---|---|---|
| committer | Mark Johnston <markj@FreeBSD.org> | 2026-07-24 21:09:48 +0000 |
| commit | 7392dc9d26830fe9d19e035d2e08f19dcca96591 (patch) | |
| tree | eec09f2ad485a9b611380e0fd60f89983f8263b0 | |
| parent | 4c1c2b9dab020624a1400644f98af7af4b7af68d (diff) | |
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.
| -rwxr-xr-x | tools/tools/git/git-mfc | 2 |
1 files changed, 1 insertions, 1 deletions
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: |