Merge pull request #21 from NeowayLabs/add-commit-lint-exception

fix: Fix IsValidMessage method adding a new exception for merge from master to the branch.

Author: esequielvirtuoso

CHANGELOG.md

@@ -1,3 +1,6 @@
+v2.0.2:
+ - Fix IsValidMessage method adding a new exception for merge from master to the branch (@esequiel.virtuoso)
+
 v2.0.1:
  - Fix IsValidMessage method to skip commit lint when the message is a merge from master to a developer branch. (@esequiel.virtuoso)
  - Add chore option. (@esequiel.virtuoso)

src/commit-message/commit_message_manager.go

@@ -79,7 +79,7 @@ func isMergeMasterToBranch(message string) bool {
 	splitedMessage := strings.Split(strings.ToLower(message), "\n")
 
 	for _, row := range splitedMessage {
-		if strings.Contains(row, "'origin/master' into") {
+		if strings.Contains(row, "'origin/master' into") || strings.Contains(row, "merge branch 'master' into") {
 			return true
 		}
 	}

src/commit-message/commit_message_manager_test.go

@@ -100,4 +100,8 @@ func TestIsValidMessageMergeMasterBranchSuccess(t *testing.T) {
 	message := "first message row \n Merge remote-tracking branch 'origin/master' into something \n last message row"
 	actual := f.commitMessageManager.IsValidMessage(message)
 	tests.AssertTrue(t, actual)
+
+	message = "first message row \n Merge branch 'master' into something \n last message row"
+	actual = f.commitMessageManager.IsValidMessage(message)
+	tests.AssertTrue(t, actual)
 }