This commit is contained in:
2026-01-21 16:37:15 +08:00
parent 0c6e718175
commit 6108ea7ebb

View File

@@ -7,10 +7,19 @@ if ! git rev-parse --is-inside-work-tree >/dev/null 2>&1; then
exit 1
fi
# 重置本地修改、切main分支拉最新代码过滤正常提示仅保留错误输出
# 重置本地修改
git restore .
git checkout main 2>&1 | grep -v "Already on '\|Your branch is up to date'" || { echo "切换main分支失败终止执行"; exit 1; }
git pull origin main --rebase 2>&1 | grep -v "Already up to date\|From\|-> FETCH_HEAD" || { echo "拉取main分支最新代码失败终止执行"; exit 1; }
# 切main分支屏蔽正常提示仅失败时退出
echo "切换到main分支..."
git checkout main >/dev/null 2>&1 || { echo "切换main分支失败终止执行"; exit 1; }
# 拉最新代码:兼容"已最新"场景,仅真失败才退出(核心修复)
echo "拉取main分支最新代码..."
if ! git pull origin main --rebase >/dev/null 2>&1; then
echo "拉取main分支最新代码失败终止执行"
exit 1
fi
# 优先取HEAD关联tag无则取仓库最近tag
get_latest_tag() {