update

build/commit-hook.js

@@ -50,11 +50,11 @@ function conflictCheck() {
     }    
 }
 
-if(fs.existsSync(mergeMsgPath)){
-    mergeCheck()
-} else {
+// if(fs.existsSync(mergeMsgPath)){
+//     mergeCheck()
+// } else {
     commitMsgCheck()    
-}
+// }
 
 conflictCheck()
 

build/merge-hook.js

+const fs = require('fs')
+const path = require('path')
+const chalk = require('chalk')
+const logSymbols = require('log-symbols')
+const execSync = require('child_process').execSync
+
+const gitPath = path.join(process.cwd(), process.env.HUSKY_GIT_PARAMS);
+const mergeMsgPath = path.join(gitPath,'../','MERGE_MSG')
+
+function mergeCheck(){
+    const mergeMsg = fs.readFileSync(mergeMsgPath, 'utf-8');
+
+    console.log(logSymbols.info, chalk.blue('开始分支检测...'))
+    let curBranch = execSync("git symbolic-ref HEAD | sed -e \'s,.*/\(.*\),\1,\'", {encoding: 'utf-8'})
+
+    console.log('curBranch', curBranch)
+    console.log('mergeBranch' ,mergeMsg)
+    // process.exit(1)
+}
+
+mergeCheck()
+
+
+process.exit(0)
\ No newline at end of file

package.json

@@ -12,7 +12,8 @@
   },
   "husky": {
     "hooks": {
-      "commit-msg": "node ./build/commit-hook.js $HUSKY_GIT_PARAMS"
+      "commit-msg": "node ./build/commit-hook.js $HUSKY_GIT_PARAMS",
+      "prepare-commit-msg": "node ./build/merge-hook.js $HUSKY_GIT_PARAMS"
     }
   },
   "keywords": [],