update

build/commit-hook.js

@@ -4,19 +4,17 @@ const chalk = require('chalk')
 const logSymbols = require('log-symbols')
 const execSync = require('child_process').execSync
 
-const gitPath = path.join(process.cwd(), '.git/COMMIT_EDITMSG');
+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');
-    if(mergeMsg){
     console.log(logSymbols.info, chalk.blue('开始分支检测...'))
+    const mergeMsg = fs.readFileSync(mergeMsgPath, 'utf-8');
     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)
-    }
 }
 
 function commitMsgCheck(){
@@ -50,11 +48,11 @@ function conflictCheck() {
     }    
 }
 
-// if(fs.existsSync(mergeMsgPath)){
-//     mergeCheck()
-// } else {
+if(fs.existsSync(mergeMsgPath)){
+    mergeCheck()
+} else {
     commitMsgCheck()    
-// }
+}
 
 conflictCheck()
 

package.json

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

test.js

 console.log(1)
+console.log(1)
+console.log(1)
+console.log(1)
\ No newline at end of file