Skip to content

G
git-hooks-test
Commit 619719de authored by shangbj's avatar shangbj
Browse files
Options

update

parent a8aebbf8
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
build/commit-hook.js
View file @ 619719de
...@@ -4,7 +4,7 @@ const chalk = require('chalk') ...@@ -4,7 +4,7 @@ const chalk = require('chalk')
const logSymbols = require('log-symbols') const logSymbols = require('log-symbols')
const execSync = require('child_process').execSync const execSync = require('child_process').execSync
const gitPath = path.join(process.cwd(), process.env.HUSKY_GIT_PARAMS); const gitPath = path.join(process.cwd(), '.git/COMMIT_EDITMSG');
const mergeMsgPath = path.join(gitPath,'../','MERGE_MSG') const mergeMsgPath = path.join(gitPath,'../','MERGE_MSG')
function mergeCheck(){ function mergeCheck(){
......
build/merge-hook.js
View file @ 619719de
...@@ -4,7 +4,7 @@ const chalk = require('chalk') ...@@ -4,7 +4,7 @@ const chalk = require('chalk')
const logSymbols = require('log-symbols') const logSymbols = require('log-symbols')
const execSync = require('child_process').execSync const execSync = require('child_process').execSync
const gitPath = path.join(process.cwd(), process.env.HUSKY_GIT_PARAMS); const gitPath = path.join(process.cwd(), '.git/COMMIT_EDITMSG');
const mergeMsgPath = path.join(gitPath,'../','MERGE_MSG') const mergeMsgPath = path.join(gitPath,'../','MERGE_MSG')
function mergeCheck(){ function mergeCheck(){
......
package.json
View file @ 619719de
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
}, },
"husky": { "husky": {
"hooks": { "hooks": {
"commit-msg": "node ./build/commit-hook.js $HUSKY_GIT_PARAMS", "pre-commit": "node ./build/commit-hook.js $HUSKY_GIT_PARAMS",
"prepare-commit-msg": "node ./build/merge-hook.js $HUSKY_GIT_PARAMS" "pre-merge-commit": "node ./build/merge-hook.js $HUSKY_GIT_PARAMS"
} }
}, },
"keywords": [], "keywords": [],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment