Skip to content

💍 chore: fix pre-commit amend #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pdsuwwz merged 1 commit into from
May 10, 2024
Merged

💍 chore: fix pre-commit amend #68

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions .husky/pre-commit
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,13 @@ HAS_DIFF=$(git diff --cached HEAD)


if [ "$IS_AMEND" -eq 0 ] && [ -z "$HAS_DIFF" ]; then
echo "可能是 amend 操作"
exit 0
if ! git diff-index --quiet HEAD --; then
echo "\n${RED}❌ 代码未添加到暂存区，请先 git add 添加变更。${RESET}\n"
exit 1
else
echo "可能是 amend 操作"
exit 0
fi
fi


Expand All @@ -32,8 +37,7 @@ if pnpm lint-staged; then
# 暂存区为空，输出警告信息
echo "\n${RED}❌ Commit 失败，请检查以下可能原因：\n"
echo "\t1. lint-staged 修复后代码与上次提交一致，无新变更"
echo "\t2. 代码未添加到暂存区"
echo "\t3. ESLint 插件未生效，请检查插件状态"
echo "\t2. ESLint 插件未生效，请检查插件状态"
echo "\n请检查代码，并重新 add 后再尝试提交。 ${RESET}\n"
exit 1
else
Expand Down