fix(0.0.1): 增加对自动 merge 消息的兼容

mritd · mritd · commit d9400b08c3f7 · 2018-03-13T11:05:49.000+08:00
增加在 pull 远程分支到本地时，自动产生的 "Merge branch..." 消息的兼容处理

Signed-off-by: mritd &lt;mritd1234@gmail.com&gt;
diff --git a/pkg/commit/cm.go b/pkg/commit/cm.go
@@ -5,6 +5,7 @@ import (
 	"io/ioutil"
 	"os"
 	"regexp"
+	"strings"
 
 	"github.com/mritd/gitflow-toolkit/pkg/consts"
 	"github.com/mritd/gitflow-toolkit/pkg/util"
@@ -38,7 +39,9 @@ func CheckCommitMessage(args []string) {
 		case string(consts.CHORE):
 		case string(consts.PERF):
 		default:
-			checkFailed()
+			if !strings.HasPrefix(string(b), "Merge branch") {
+				checkFailed()
+			}
 		}
 	}
 }
diff --git a/pkg/consts/consts.go b/pkg/consts/consts.go
@@ -32,4 +32,4 @@ const CommitTpl = `{{ .Type }}({{ .Scope }}): {{ .Subject }}
 {{ .Sob }}
 `
 
-const CommitMessagePattern = `^(?:fixup!\s*)?(\w*)(\(([\w\$\.\*/-]*)\))?\: (.*)`
+const CommitMessagePattern = `^(?:fixup!\s*)?(\w*)(\(([\w\$\.\*/-]*)\))?\: (.*)|^Merge\ branch(.*)`

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ import (`
`5`	`5`	`"io/ioutil"`
`6`	`6`	`"os"`
`7`	`7`	`"regexp"`
	`8`	`+ "strings"`
`8`	`9`
`9`	`10`	`"github.com/mritd/gitflow-toolkit/pkg/consts"`
`10`	`11`	`"github.com/mritd/gitflow-toolkit/pkg/util"`
`@@ -38,7 +39,9 @@ func CheckCommitMessage(args []string) {`
`38`	`39`	`case string(consts.CHORE):`
`39`	`40`	`case string(consts.PERF):`
`40`	`41`	`default:`
`41`		`- checkFailed()`
	`42`	`+ if !strings.HasPrefix(string(b), "Merge branch") {`
	`43`	`+ checkFailed()`
	`44`	`+ }`
`42`	`45`	`}`
`43`	`46`	`}`
`44`	`47`	`}`
Original file line number	Diff line number	Diff line change
@@ -32,4 +32,4 @@ const CommitTpl = `{{ .Type }}({{ .Scope }}): {{ .Subject }}
`32`	`32`	`{{ .Sob }}`
`33`	`33`	`
`34`	`34`
`35`		-const CommitMessagePattern = `^(?:fixup!\s)?(\w)(\(([\w\$\.\/-])\))?\: (.*)`
	`35`	+const CommitMessagePattern = `^(?:fixup!\s)?(\w)(\(([\w\$\.\/-])\))?\: (.)\|^Merge\ branch(.)`