Merge pull request #20 from alexphillips-dev/fix/main-history-guard-allows-pr-merges

Allow GitHub PR merges in main history guard

Author: alexphillips-dev

scripts/main_branch_history_guard.sh

@@ -72,12 +72,18 @@ ensure_allowed_merge_refs() {
 
 merge_commit_allowed() {
   local commit="${1:-}"
+  local subject=""
   local parent_refs=""
   local parent_list=()
   local parent_index=0
   local parent_commit=""
   local allowed_ref=""
 
+  subject="$(git show -s --format=%s "${commit}" 2>/dev/null || true)"
+  if [[ "${subject}" =~ ^Merge\ pull\ request\ #[0-9]+ ]]; then
+    return 0
+  fi
+
   parent_refs="$(git show -s --format=%P "${commit}" 2>/dev/null || true)"
   if [[ -z "${parent_refs}" ]]; then
     return 1

tests/versioning-guard.test.mjs

@@ -426,6 +426,7 @@ test('standards guard scripts exist with expected core checks', () => {
     assert.match(mainBranchHistoryGuard, /FVPLUS_MAIN_HISTORY_BASE_REF/);
     assert.match(mainBranchHistoryGuard, /@\{upstream\}\.\.HEAD/);
     assert.match(mainBranchHistoryGuard, /merge_commit_allowed/);
+    assert.match(mainBranchHistoryGuard, /Merge\\ pull\\ request\\ #\[0-9\]\+/);
     assert.match(mainBranchHistoryGuard, /main-branch merge commits must promote only dev\/beta history/);
     assert.match(mainBranchHistoryGuard, /Main branch history guard passed/);
     assert.match(unraidMatrixSmoke, /FVPLUS_UNRAID_MATRIX/);