rsgltzyd/testing-tool
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(hooks): 用 merge-base 替代 rev-parse 修复 pre-push 变更文件检测

Browse Source
This commit is contained in:
雨霖铃
2026-06-05 13:02:30 +08:00
parent 10644fae95
commit d964e27c9d
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.husky/pre-push
+6 -4
View File
@@ -4,8 +4,10 @@ npx tsc --noEmit
# ESLint 严格检查（仅检查本次推送的变更文件，不阻塞不相关的旧代码） # ESLint 严格检查（仅检查本次推送的变更文件，不阻塞不相关的旧代码）
# 新分支无 upstream 时，回退到与 origin/main 对比 # 新分支无 upstream 时，回退到与 origin/main 对比
BASE=$(git rev-parse --verify @{upstream} 2>/dev/null && echo "@{upstream}" || echo "origin/main") MERGE_BASE=$(git merge-base HEAD @{upstream} 2>/dev/null || git merge-base HEAD origin/main 2>/dev/null)
CHANGED_FILES=$(git diff --name-only --diff-filter=d "$BASE"...HEAD -- '*.ts' '*.tsx' '*.js' '*.jsx' '*.mjs') if [ -n "$MERGE_BASE" ]; then
if [ -n "$CHANGED_FILES" ]; then CHANGED_FILES=$(git diff --name-only --diff-filter=d "$MERGE_BASE" HEAD -- '*.ts' '*.tsx' '*.js' '*.jsx' '*.mjs')
echo "$CHANGED_FILES" | xargs npx eslint --max-warnings=0 if [ -n "$CHANGED_FILES" ]; then
echo "$CHANGED_FILES" | xargs npx eslint --max-warnings=0
fi
fi fi