Skip to content

Commit 54f834b

Browse files
author
Simon Prochazka
committed
fix: certain merge commit styles fail test for merge commit
- Github PR format was not covered by the regexes Closes #92
1 parent db77625 commit 54f834b

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

pkg/text/is_merge_commit.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66

77
var mergeCommitRegex = regexp.MustCompile(`^Merge commit '(?P<hash>\S+)'`)
88
var mergeBranchRegex = regexp.MustCompile(`^Merge branch '(?P<incoming>\w+)' into (?P<current>\S+)`)
9+
var mergePRRegex = regexp.MustCompile(`^Merge pull request (?P<incoming>#\d+) from (?P<current>\S+)`)
910
var kodiakMergeBranchRegex = regexp.MustCompile(`^Merge (?P<incoming>\w+) into (?P<current>\S+)`)
1011

1112
// IsMergeCommit tests message string against expected format of a merge commit and returns true/false based on it
@@ -14,9 +15,11 @@ func IsMergeCommit(message string) bool {
1415

1516
mergeBranchMatch := mergeBranchRegex.FindStringSubmatch(message)
1617

18+
mergePRMatch := mergePRRegex.FindStringSubmatch(message)
19+
1720
kodiakMergeBranchMatch := kodiakMergeBranchRegex.FindStringSubmatch(message)
1821

19-
if mergeCommitMatch != nil || mergeBranchMatch != nil || kodiakMergeBranchMatch != nil {
22+
if mergeCommitMatch != nil || mergeBranchMatch != nil || mergePRMatch != nil || kodiakMergeBranchMatch != nil {
2023
return true
2124
}
2225

pkg/text/is_merge_commit_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ func TestIsMergeCommit(t *testing.T) {
1212
"Merge branch 'master' into three\n": true,
1313
"Merge branch 'master' into feature/something-word": true,
1414
"Merge master into renovate/docker-alpine-3.x": true,
15+
"Merge pull request #5 from D-Nice/feat/ci": true,
1516
"chore: something\n": false,
1617
"fix: test": false,
1718
"fix: Kodiak style regex": false,

0 commit comments

Comments
 (0)