From 26d16571280206ed6fea9d096d7af87555e9d8a9 Mon Sep 17 00:00:00 2001 From: Wisdom Date: Fri, 10 May 2024 10:55:53 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=92=A1=20chore:=20up=20tips=20pre=20c?= =?UTF-8?q?ommit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .husky/pre-commit | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.husky/pre-commit b/.husky/pre-commit index 6ab6612..429c218 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -7,7 +7,7 @@ RESET='\033[0m' # 检查是否在 Git 仓库目录下 git rev-parse --git-dir >/dev/null 2>&1 || { - echo >&2 "${RED}❌ 错误: 当前目录不是 Git 仓库${RESET}" + echo >&2 "${RED}❌ 当前目录非 Git 仓库${RESET}" exit 1 } @@ -21,10 +21,10 @@ HAS_DIFF=$(git diff --cached HEAD) if [ "$IS_AMEND" -eq 0 ] && [ -z "$HAS_DIFF" ]; then if ! git diff-index --quiet HEAD --; then - echo "\n${RED}❌ 代码未添加到暂存区,请先 git add 添加变更。${RESET}\n" + echo "\n${RED}❗ 代码未添加到暂存区,请先 git add . 添加变更。 ${RESET}\n" exit 1 else - echo "可能是 amend 操作" + echo "\n${RED}❗ 暂存区无任何变更" exit 0 fi fi @@ -38,14 +38,14 @@ if pnpm lint-staged; then echo "\n${RED}❌ Commit 失败,请检查以下可能原因:\n" echo "\t1. lint-staged 修复后代码与上次提交一致,无新变更" echo "\t2. ESLint 插件未生效,请检查插件状态" - echo "\n请检查代码,并重新 add 后再尝试提交。 ${RESET}\n" + echo "\n请检查代码,并重新${BOLD} git add .${RESET} ${RED}后再尝试提交。 ${RESET}\n" exit 1 else # 暂存区有变化,可继续提交 - echo "\n${GREEN}✅ ESLint 校验成功,可以继续提交${RESET}\n" + echo "\n${GREEN}✔️ ESLint 校验成功,可以继续提交${RESET}\n" fi else # lint-staged 失败 - echo "${BOLD}${RED}🥴 ESLint 校验失败,请尝试修复错误后再重新执行 add、commit。${RESET}\n" + echo "${BOLD}${RED}🥴 ESLint 校验失败,请尝试修复错误后再重新执行 add、commit ${RESET}\n" exit 1 fi From 480d91f9c7ebe77f6969962cee657e22d03cf5ec Mon Sep 17 00:00:00 2001 From: Wisdom Date: Fri, 10 May 2024 10:57:11 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=92=A1=20chore:=20up=20tips=20pre=20c?= =?UTF-8?q?ommit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .husky/pre-commit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.husky/pre-commit b/.husky/pre-commit index 429c218..9ba35bb 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -24,7 +24,7 @@ if [ "$IS_AMEND" -eq 0 ] && [ -z "$HAS_DIFF" ]; then echo "\n${RED}❗ 代码未添加到暂存区,请先 git add . 添加变更。 ${RESET}\n" exit 1 else - echo "\n${RED}❗ 暂存区无任何变更" + echo "\n${RED}❗ 暂存区无任何变更${RESET}" exit 0 fi fi From db0467587d6280319dba666cb7864791fa4e5917 Mon Sep 17 00:00:00 2001 From: Wisdom Date: Fri, 10 May 2024 10:58:37 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=92=A1=20chore:=20up=20tips=20pre=20c?= =?UTF-8?q?ommit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .husky/pre-commit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.husky/pre-commit b/.husky/pre-commit index 9ba35bb..f80bbc8 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -24,7 +24,7 @@ if [ "$IS_AMEND" -eq 0 ] && [ -z "$HAS_DIFF" ]; then echo "\n${RED}❗ 代码未添加到暂存区,请先 git add . 添加变更。 ${RESET}\n" exit 1 else - echo "\n${RED}❗ 暂存区无任何变更${RESET}" + echo "\n${RED} 暂存区无任何变更或执行了 --amend 操作${RESET}" exit 0 fi fi