From 8517083cec6b195fb9f56ab219c74c9445780d13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@youzan.com>
Date: Tue, 3 Dec 2019 09:44:44 +0800
Subject: [PATCH] fix(cli): incorrect commit lint

---
 packages/vant-cli/src/commands/commit-lint.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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.