Account for main being used instead of master in lock code

lancaster-university · Mar 22, 2024 · fc1dd86 · fc1dd86
1 parent 1a3d477
commit fc1dd86
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/utils/python/codal_utils.py b/utils/python/codal_utils.py
@@ -134,8 +134,8 @@ def get_next_version(options):
     v2 = int(m.group(3))
     vB = -1
     branchName = os.popen('git rev-parse --abbrev-ref HEAD').read().strip()
-    if not options.branch and branchName != "master":
-        print("On non-master branch use -l -b")
+    if not options.branch and branchName not in ["master","main"]:
+        print("On feature branch use -l -b")
         exit(1)
     suff = ""
     if options.branch: