Merge pull request #29 from rockstaedt/28-exclude-merge-branch-commits

rockstaedt · web-flow · commit 13df56ae8914 · 2023-02-15T19:51:17.000+01:00
Ignore validation for branch merge commits
diff --git a/internal/model/commit_message.go b/internal/model/commit_message.go
@@ -22,7 +22,7 @@ func CreateCommitMessageFrom(messageLines []string) *CommitMessage {
 func (cm *CommitMessage) ValidateSubject() int {
 	currentSubjectLength := len(cm.Subject)
 
-	if strings.HasPrefix(cm.Subject, "Merge pull request") {
+	if strings.HasPrefix(cm.Subject, "Merge ") {
 		return 0
 	}
 
diff --git a/internal/model/commit_message_test.go b/internal/model/commit_message_test.go
@@ -65,6 +65,7 @@ func TestNewCommitMessage(t *testing.T) {
 			{"#1301 - more than........50..............through ID prefix", 0},
 			{"short subject line", 0},
 			{"Merge pull request commits are ignored because they can easily exceed 52 characters", 0},
+			{"Merge branch commits are also ignored..............................................", 0},
 		}
 
 		for _, tc := range testcases {

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ func CreateCommitMessageFrom(messageLines []string) *CommitMessage {`
`22`	`22`	`func (cm *CommitMessage) ValidateSubject() int {`
`23`	`23`	`currentSubjectLength := len(cm.Subject)`
`24`	`24`
`25`		`- if strings.HasPrefix(cm.Subject, "Merge pull request") {`
	`25`	`+ if strings.HasPrefix(cm.Subject, "Merge ") {`
`26`	`26`	`return 0`
`27`	`27`	`}`
`28`	`28`
Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,7 @@ func TestNewCommitMessage(t *testing.T) {`
`65`	`65`	`{"#1301 - more than........50..............through ID prefix", 0},`
`66`	`66`	`{"short subject line", 0},`
`67`	`67`	`{"Merge pull request commits are ignored because they can easily exceed 52 characters", 0},`
	`68`	`+ {"Merge branch commits are also ignored..............................................", 0},`
`68`	`69`	`}`
`69`	`70`
`70`	`71`	`for _, tc := range testcases {`