From 45c7dc79a6c1ac19a6a0981f08146cb419b30891 Mon Sep 17 00:00:00 2001 From: Yashwanth Anantharaju Date: Mon, 4 May 2026 13:30:55 -0400 Subject: fix: expand merge commit SHA regex and add SHA-256 test cases (#2414) * fix: expand merge commit SHA regex and add SHA-256 test cases Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * test: add checkCommitInfo SHA coverage Add checkCommitInfo tests for SHA-1 and SHA-256 merge messages and reject invalid 50-character hex merge heads.\n\nCo-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * style: fix Prettier formatting in test and source files Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- src/input-helper.ts | 2 +- src/ref-helper.ts | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/input-helper.ts b/src/input-helper.ts index 059232f..e0c61e2 100644 --- a/src/input-helper.ts +++ b/src/input-helper.ts @@ -71,7 +71,7 @@ export async function getInputs(): Promise { } } // SHA? - else if (result.ref.match(/^[0-9a-fA-F]{40}$/)) { + else if (result.ref.match(/^(?:[0-9a-fA-F]{40}|[0-9a-fA-F]{64})$/)) { result.commit = result.ref result.ref = '' } diff --git a/src/ref-helper.ts b/src/ref-helper.ts index 5130f53..71e8b22 100644 --- a/src/ref-helper.ts +++ b/src/ref-helper.ts @@ -258,7 +258,9 @@ export async function checkCommitInfo( } // Extract details from message - const match = commitInfo.match(/Merge ([0-9a-f]{40}) into ([0-9a-f]{40})/) + const match = commitInfo.match( + /Merge ([0-9a-f]{40}|[0-9a-f]{64}) into ([0-9a-f]{40}|[0-9a-f]{64})/ + ) if (!match) { core.debug('Unexpected message format') return -- cgit v1.2.3