hookehuyr

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

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

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