diff --git a/packages/vant-cli/src/commands/commit-lint.ts b/packages/vant-cli/src/commands/commit-lint.ts index 13ff1285e..a73d88a2a 100644 --- a/packages/vant-cli/src/commands/commit-lint.ts +++ b/packages/vant-cli/src/commands/commit-lint.ts @@ -8,7 +8,7 @@ export function commitLint() { const gitParams = process.env.HUSKY_GIT_PARAMS as string; const commitMsg = readFileSync(gitParams, 'utf-8').trim(); - if (!commitRE.test(commitMsg) || !mergeRE.test(commitMsg)) { + if (!commitRE.test(commitMsg) && !mergeRE.test(commitMsg)) { logger.error(`Error: invalid commit message: "${commitMsg}". Proper commit message format is required for automated changelog generation.