refactor: use HasPrefix instead of regexp to check Merge message

JayceChant · JayceChant · commit 85910f4c579c · 2018-06-07T23:26:52.000+08:00
to reduce complexity and error
diff --git a/commit-msg.go b/commit-msg.go
@@ -110,13 +110,7 @@ func validateMsg(msg string) {
 		logAndExit(EmptyMessage)
 	}
 
-	isMerge, err := regexp.MatchString(MERGE_PATTERN, msg)
-	if err != nil {
-		log.Println(err)
-		logAndExit(UndefindedError)
-	}
-
-	if isMerge {
+	if strings.HasPrefix(msg, MERGE_PREFIX) {
 		logAndExit(Merge)
 	}
 
diff --git a/config.go b/config.go
@@ -7,7 +7,7 @@ import (
 )
 
 const (
-	MERGE_PATTERN    = `^Merge `
+	MERGE_PREFIX    = `Merge `
 	HEADER_PATTERN   = `^((fixup! |squash! )?(\w+)(?:\(([^\)\s]+)\))?: (.+))(?:\n|$)`
 	CONFIG_FILE_NAME = "commit-msg.cfg.json"
 	HOOK_DIR         = "./.git/hooks/"

Original file line number	Diff line number	Diff line change
`@@ -110,13 +110,7 @@ func validateMsg(msg string) {`
`110`	`110`	`logAndExit(EmptyMessage)`
`111`	`111`	`}`
`112`	`112`
`113`		`- isMerge, err := regexp.MatchString(MERGE_PATTERN, msg)`
`114`		`- if err != nil {`
`115`		`- log.Println(err)`
`116`		`- logAndExit(UndefindedError)`
`117`		`- }`
`118`		`-`
`119`		`- if isMerge {`
	`113`	`+ if strings.HasPrefix(msg, MERGE_PREFIX) {`
`120`	`114`	`logAndExit(Merge)`
`121`	`115`	`}`
`122`	`116`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import (`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`const (`
`10`		- MERGE_PATTERN = `^Merge `
	`10`	+ MERGE_PREFIX = `Merge `
`11`	`11`	HEADER_PATTERN = `^((fixup! \|squash! )?(\w+)(?:\(([^\)\s]+)\))?: (.+))(?:\n\|$)`
`12`	`12`	`CONFIG_FILE_NAME = "commit-msg.cfg.json"`
`13`	`13`	`HOOK_DIR = "./.git/hooks/"`