11

build/hooks.js

@@ -11,10 +11,10 @@ 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)
+console.log('___', process.env.GIT_PREFIX)
\ No newline at end of file

package.json

@@ -13,7 +13,7 @@
   "husky": {
     "hooks": {
       "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"
+      "pre-push":"node ./build/push.js $GIT_PREFIX"
     }
   },
   "keywords": [],