update

build/commit-hook.js

@@ -8,13 +8,15 @@ const gitPath = path.join(process.cwd(), process.env.HUSKY_GIT_PARAMS);
 const mergeMsgPath = path.join(gitPath,'../','MERGE_MSG')
 
 function mergeCheck(){
-    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'})
+    if(mergeMsg){
+        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.match(/\"(.*?)\"/g))
-    // process.exit(1)
+        console.log('curBranch', curBranch)
+        console.log('mergeBranch' ,mergeMsg)
+        // process.exit(1)
+    }
 }
 
 function commitMsgCheck(){

test.js

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