hookehuyr

fix(husky): 移除 post-commit amend 机制避免循环

- 简化 prepare-commit-msg 条件判断
- 移除 post-commit 的 amend 操作
- 修复 CHANGELOG 自动更新循环重复问题

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
#!/bin/sh
# ============================================
# Post-commit Hook
# ============================================
#
# 功能:
# 1. 显示提交成功信息
# 2. 将 CHANGELOG amend 到当前提交(如果需要)
#
# 作者:Claude Code
# 日期:2026-02-28
# ============================================
# Post-commit Hook - 只显示信息,不执行 amend
# 颜色定义
RED='\033[0;31m'
GREEN='\033[0;32m'
BLUE='\033[0;34m'
YELLOW='\033[1;33m'
NC='\033[0m' # No Color
NC='\033[0m'
# 获取最新的 commit message
COMMIT_MSG=$(git log -1 --pretty=%B)
COMMIT_HASH=$(git log -1 --pretty=%h)
COMMIT_AUTHOR=$(git log -1 --pretty=%an)
......@@ -27,8 +15,6 @@ COMMIT_DATE=$(git log -1 --pretty=%ad --date=iso)
echo ""
echo "✅ ${GREEN}提交成功!${NC}"
echo ""
# 显示提交信息
echo "📝 ${BLUE}提交信息:${NC}"
echo " Hash: $COMMIT_HASH"
echo " Author: $COMMIT_AUTHOR"
......@@ -36,7 +22,6 @@ echo " Date: $COMMIT_DATE"
echo " Msg: $(echo "$COMMIT_MSG" | head -n 1)"
echo ""
# 统计本次提交的改动
STATS=$(git diff HEAD~1 --numstat 2>/dev/null | awk '{added+=$1; deleted+=$2; files++} END {print files, added, deleted}')
FILES_CHANGED=$(echo "$STATS" | cut -d' ' -f1)
LINES_ADDED=$(echo "$STATS" | cut -d' ' -f2)
......@@ -47,43 +32,6 @@ echo " 文件数: $FILES_CHANGED"
echo " 新增行数: +$LINES_ADDED"
echo " 删除行数: -$LINES_DELETED"
echo ""
# ============================================
# 将 CHANGELOG amend 到当前提交(如果在暂存区)
# ============================================
if ! git diff --cached --quiet CHANGELOG.md 2>/dev/null; then
echo "📝 ${BLUE}将 CHANGELOG 加入当前提交...${NC}"
# 使用 amend 将 CHANGELOG 加入当前提交
# --no-edit: 不修改 commit message
# --no-verify: 跳过 hooks,避免循环
git commit --amend --no-edit --no-verify >/dev/null 2>&1
if [ $? -eq 0 ]; then
# 获取 amend 后的 hash
NEW_HASH=$(git log -1 --pretty=%h)
echo " ${GREEN}✅ CHANGELOG 已加入提交${NC}"
echo " ${BLUE} 新 Hash: $NEW_HASH${NC}"
else
echo " ${YELLOW}⚠️ CHANGELOG amend 失败${NC}"
fi
fi
echo ""
# 提示下一步操作
echo "🚀 ${BLUE}下一步操作:${NC}"
# 检查是否有未推送的提交
UNPUSHED=$(git log @{u}..HEAD 2>/dev/null | grep -c "^commit" || true)
if [ "$UNPUSHED" -gt 0 ]; then
echo " ${YELLOW}$UNPUSHED 个提交未推送到远程${NC}"
echo " ${YELLOW}请使用 'git push' 推送${NC}"
else
echo " ${GREEN}✅ 所有提交已同步到远程${NC}"
fi
echo ""
echo "💡 ${BLUE}提示:${NC}"
echo " - 如需修改最近的提交,使用: git commit --amend"
echo " - 如需查看提交历史,使用: git log --oneline"
......
......@@ -2,52 +2,26 @@
# ============================================
# Prepare-commit-msg Hook
# ============================================
#
# 功能:
# 1. 自动更新 CHANGELOG.md(包含在当前提交中)
#
# 关键特性:
# - 只在初始提交时执行,amend 时不会触发
# - 配合 post-commit 使用 amend --no-verify 完成流程
#
# 作者:Claude Code
# 日期:2026-02-28
# ============================================
# 颜色定义
RED='\033[0;31m'
GREEN='\033[0;32m'
BLUE='\033[0;34m'
YELLOW='\033[1;33m'
NC='\033[0m' # No Color
NC='\033[0m'
# 获取 commit message 文件
COMMIT_MSG_FILE=$1
COMMIT_SOURCE=$2 # commit 来源:message/template/merge/squash等
COMMIT_SOURCE=$2
# 只跳过 merge 提交,其他情况都执行
# 这样可以确保无论使用何种方式提交(-m/-C/-c等),CHANGELOG 都会被更新
if [ "$COMMIT_SOURCE" != "merge" ]; then
# 读取 commit message
if [ -f "$COMMIT_MSG_FILE" ]; then
COMMIT_MSG=$(cat "$COMMIT_MSG_FILE")
# 只处理第一行(subject)
FIRST_LINE=$(echo "$COMMIT_MSG" | head -n 1)
# 解析 commit type
COMMIT_TYPE=$(echo "$FIRST_LINE" | sed -E 's/^([a-z]+)\(.*/\1/')
# 只对特定类型更新 CHANGELOG
# 跳过: docs(changelog) 类型的提交,避免循环
# 只对特定类型更新 CHANGELOG,跳过 docs(changelog)
if echo "$FIRST_LINE" | grep -qE "^docs\(changelog\):"; then
# 跳过
:
elif [ "$COMMIT_TYPE" = "feat" ] || [ "$COMMIT_TYPE" = "fix" ] || [ "$COMMIT_TYPE" = "refactor" ] || [ "$COMMIT_TYPE" = "perf" ]; then
echo ""
echo "📝 ${BLUE}更新 CHANGELOG...${NC}"
# 调用 CHANGELOG 更新脚本
bash scripts/changelog/update-changelog-prepare.sh "$COMMIT_MSG_FILE"
fi
fi
......