From a446bd7d054d19cc8fa24087e7b9d377005507f4 Mon Sep 17 00:00:00 2001
From: Hanchuan Wu <whc.shmily@gmail.com>
Date: Wed, 13 Jul 2022 10:00:59 +0000
Subject: [PATCH] [bin][util] main branch can be named as main or master
---
bin/util/common.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bin/util/common.py b/bin/util/common.py
index 7225d19f30..f5acf6d029 100644
--- a/bin/util/common.py
+++ b/bin/util/common.py
@@ -273,7 +273,7 @@ def hasUntrackedFiles(pathToRepo="."):
def isPersistentBranch(branchName):
"""Check if a branch is what we consider persistent (default protected branches)"""
- if branchName == "origin/master":
+ if branchName in ("origin/master", "origin/main"):
return True
if branchName.startswith("origin/releases/"):
return True
--
GitLab