diff options
Diffstat (limited to 'src/ref-helper.ts')
| -rw-r--r-- | src/ref-helper.ts | 4 |
1 files changed, 3 insertions, 1 deletions
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 |