1212

build/hooks.js

@@ -4,17 +4,17 @@
 * https://github.com/typicode/husky/issues/71
 * https://github.com/typicode/husky/issues/
 * 主要是读取 .git/COMMIT_EDITMSG 这个文件，文件记录了当前commit之后的信息
-// MERGE_MSG
-*/
+// MERGE_MSG  //merge 临时文件  输出  Merge branch 'dev'
+*/ 
 var fs = require('fs');
 var path = require('path');
 // console.log('______', process.env.HUSKY_GIT_STDIN, process.env.HUSKY_GIT_PARAMS, process.env.GIT_INTERNAL_GETTEXT_SH_SCHEME, process.env.GIT_AUTHOR_EMAIL)
 var gitPath = path.resolve(__dirname, `../${process.env.HUSKY_GIT_PARAMS}`);
 var commitMsg = fs.readFileSync(gitPath, 'utf-8');
-// var gitMerge = path.resolve(__dirname, '../.git/MERGE_MSG');
-// var mergeMsg = fs.readFileSync(gitMerge, 'utf-8');
+var gitMerge = path.resolve(__dirname, '../.git/MERGE_MSG');
+var mergeMsg = fs.readFileSync(gitMerge, 'utf-8');
 
-// console.log(mergeMsg.toString())
+console.log('----', mergeMsg.toString())
 var pattern = /<<< HEAD/g;
 
 if (pattern.test(commitMsg)) {

build/push.js

+console.log(process.env.GIT_PUSH_OPTION_COUNT)
\ No newline at end of file

package.json

@@ -12,7 +12,8 @@
   },
   "husky": {
     "hooks": {
-      "commit-msg": "node ./build/hooks.js $HUSKY_GIT_PARAMS $HUSKY_GIT_STDIN $GIT_INTERNAL_GETTEXT_SH_SCHEME $GIT_AUTHOR_EMAIL"
+      "commit-msg": "node ./build/hooks.js $HUSKY_GIT_PARAMS $HUSKY_GIT_STDIN $GIT_INTERNAL_GETTEXT_SH_SCHEME $GIT_AUTHOR_EMAIL",
+      "pre-push":"node ./build/push.js $GIT_PUSH_OPTION_COUNT"
     }
   },
   "keywords": [],