修复一些文件

This commit is contained in:
2509_92447106 committed 2026-11-13 22:09:17 +08:00
1 parent f1787dff9d
commit 9293fee3bf
3 files changed
+439 -164

No files matched your search

+218 -82
View File
@@ -1,17 +1,18 @@
#!/bin/sh
# autogit —— 提交并推送到所有已配置的仓库(一键多仓同步)
# autogit —— 交互式提交:仓库 → 地址 → 分支 → 信息 → 确认 → 执行
#
# 用法:
# ./git.sh autogit 自动生成提交信息并推送所有仓库
# ./git.sh autogit -m "提交信息" 指定提交信息
# ./git.sh autogit -m "..." -n 只提交到暂存区,不推送
# ./git.sh autogit --dry-run 只看会提交什么,不动仓库
# ./git.sh autogit 交互模式
# ./git.sh autogit --dry-run 只看会提交什么,不动仓库
#
# 多仓库:脚本会遍历 `git remote` 里的**每一个**远程,依次 push。
# 加仓库: git remote add gitee git@github.com:user/repo.git
# 看仓库: git remote -v
# 交互流程(严格按此顺序):
# 1. 选择要提交到哪个仓库(或直接输入仓库地址)
# 2. 确认该仓库地址
# 3. 确认提交分支(可改成其它分支)
# 4. 输入提交信息
# 5. 汇总确认后执行
#
# 自动跳过(永不提交):dist/ build/ bin/ obj/ .GC/ node_modules/ 等构建产物与运行数据
# 自动跳过:dist/ build/ bin/ obj/ .GC/ node_modules/(任意层级)
# ---------------------------------------------------------------------------
set -eu
@@ -19,116 +20,251 @@ ROOT_DIR="${1:-.}"
shift 2>/dev/null || true
cd "$ROOT_DIR"
MSG=""
PUSH=1
DRY=0
ASSUME_YES=0
MSG=""
while [ $# -gt 0 ]; do
case "$1" in
-m|--message) MSG="${2:-}"; shift 2 ;;
-n|--no-push) PUSH=0; shift ;;
--dry-run) DRY=1; shift ;;
-y|--yes) ASSUME_YES=1; shift ;;
-h|--help) sed -n '2,18p' "$0" | sed 's/^# \{0,1\}//'; exit 0 ;;
*) echo "未知参数:$1"; exit 1 ;;
esac
done
# ---------- 0. 前置检查 ----------
line() { echo "----------------------------------------------"; }
git rev-parse --git-dir >/dev/null 2>&1 || { echo "!! 这里不是 git 仓库:$(pwd)"; exit 1; }
CUR_BRANCH=$(git rev-parse --abbrev-ref HEAD 2>/dev/null || echo "main")
[ "$CUR_BRANCH" = "HEAD" ] && CUR_BRANCH="main"
BRANCH=$(git rev-parse --abbrev-ref HEAD 2>/dev/null || echo "")
[ -n "$BRANCH" ] && [ "$BRANCH" != "HEAD" ] || { echo "!! 当前不在任何分支上"; exit 1; }
# ============ 1. 选择仓库(支持多个)============
echo "=============================================="
echo " 仓库目录:$(pwd)"
echo " 当前分支:$CUR_BRANCH"
echo "=============================================="
echo
# ---------- 1. 确保忽略规则齐全 ----------
# 这些目录即使历史上被跟踪,也不会被本次提交带上;新增的会被 .gitignore 挡住
ensure_ignore() {
pattern="$1"
grep -qxF "$pattern" .gitignore 2>/dev/null && return 0
printf '%s\n' "$pattern" >> .gitignore
echo " + .gitignore 追加 $pattern"
}
if [ -f .gitignore ]; then
for p in "dist/" "build/" "bin/" "obj/" ".GC/"; do ensure_ignore "$p"; done
fi
# ---------- 2. 收集改动 ----------
echo "==> 检查改动(分支 ${BRANCH})"
# --dry-run:只统计,绝不改动索引
if [ "$DRY" = "1" ]; then
echo
echo "(--dry-run)会被移出索引的构建产物:"
for d in dist build bin obj .GC; do
C=$(git ls-files -- "*$d/*" 2>/dev/null | wc -l | tr -d ' ')
[ "$C" != "0" ] && echo " $d/ $C 个文件"
REMOTES=$(git remote 2>/dev/null || true)
if [ -n "$REMOTES" ]; then
echo "已配置的仓库:"
i=0
for R in $REMOTES; do
i=$((i + 1))
URL=$(git remote get-url "$R" 2>/dev/null || echo "?")
printf ' %d) %-10s %s\n' "$i" "$R" "$URL"
done
echo
echo "(--dry-run)当前未提交的改动:"
git status --porcelain | grep -vE "/(dist|build|bin|obj|\\.GC)/" | head -20 | sed 's/^/ /'
echo " a) 全部"
echo " n) 添加新仓库地址"
echo
printf '请选择(可多选,用空格或逗号分隔,如 1 3 或 a 或 n;默认 1):'
read -r pick || pick=""
[ -z "$pick" ] && pick=1
else
pick="n"
fi
SELECTED=""
# 按编号取远程名
name_of() {
idx="$1"; k=0
for R in $REMOTES; do
k=$((k + 1))
[ "$k" = "$idx" ] && { echo "$R"; return 0; }
done
echo ""
}
add_remote() {
url="$1"
[ -n "$url" ] || return 0
printf ' 给 %s 起个名字(回车自动命名):' "$url"
read -r nm || nm=""
if [ -z "$nm" ]; then
# 从地址里提取仓库名做默认名
base=$(echo "$url" | sed 's|\.git$||' | sed 's|.*[/:]||')
nm="${base:-remote}"
fi
if git remote get-url "$nm" >/dev/null 2>&1; then
git remote set-url "$nm" "$url"
echo " 已更新 $nm -> $url"
else
git remote add "$nm" "$url"
echo " 已添加 $nm -> $url"
fi
SELECTED="$SELECTED $nm"
}
case "$pick" in
a|A)
for R in $REMOTES; do SELECTED="$SELECTED $R"; done
;;
n|N)
echo
echo "可以连续输入多个地址,每行一个,输入空行结束:"
while :; do
printf ' 地址:'
read -r u || u=""
[ -z "$u" ] && break
add_remote "$u"
done
;;
*)
# 支持 "1 3" / "1,3" / "1、3"
for tok in $(echo "$pick" | tr ',,、' ' '); do
case "$tok" in
a|A) for R in $REMOTES; do SELECTED="$SELECTED $R"; done ;;
n|N) echo " 请在下一行输入地址:"
printf ' 地址:'
read -r u || u=""
add_remote "$u" ;;
*)
nm=$(name_of "$tok")
if [ -n "$nm" ]; then SELECTED="$SELECTED $nm"
else echo " !! 无效编号:$tok"; fi
;;
esac
done
;;
esac
# 去重
SELECTED=$(echo "$SELECTED" | tr ' ' '\n' | awk 'NF' | awk '!seen[$0]++' | tr '\n' ' ' | sed 's/^ *//;s/ *$//')
[ -n "$SELECTED" ] || { echo "!! 没有选择任何仓库"; exit 1; }
# ============ 2. 确认仓库地址 ============
echo
line
echo " 目标仓库(共 $(echo "$SELECTED" | wc -w | tr -d ' ') 个):"
for R in $SELECTED; do
printf ' %-10s %s\n' "$R" "$(git remote get-url "$R" 2>/dev/null || echo '?')"
done
line
printf '以上地址都正确吗?(Y/n) '
read -r okaddr || okaddr=""
case "$okaddr" in
n|N)
echo
echo "逐个修改(直接回车跳过不改):"
for R in $SELECTED; do
cur=$(git remote get-url "$R" 2>/dev/null || echo "")
printf ' %s [%s] -> ' "$R" "$cur"
read -r nu || nu=""
[ -n "$nu" ] && git remote set-url "$R" "$nu" && echo " 已更新"
done
;;
esac
# ============ 3. 确认分支 ============
echo
printf '提交分支(当前 %s,直接回车沿用,或输入其它分支名):' "$CUR_BRANCH"
read -r BRANCH_IN || BRANCH_IN=""
BRANCH="${BRANCH_IN:-$CUR_BRANCH}"
if [ "$BRANCH" != "$CUR_BRANCH" ]; then
echo " 将创建/切换到分支 $BRANCH"
if git show-ref --verify --quiet "refs/heads/$BRANCH"; then
git checkout -q "$BRANCH"
else
git checkout -q -b "$BRANCH"
fi
echo " 当前分支:$(git rev-parse --abbrev-ref HEAD)"
fi
line
echo " 提交分支:$BRANCH"
line
printf '分支正确吗?(Y/n) '
read -r okbr || okbr=""
case "$okbr" in
n|N) echo "已取消"; exit 0 ;;
esac
# ============ 4. 改动清单 ============
echo
echo "自动跳过:dist/ build/ bin/ obj/ .GC/"
echo
echo "待提交的改动:"
CHANGES=$(git status --porcelain 2>/dev/null | grep -vE "/(dist|build|bin|obj|\.GC)/" || true)
if [ -z "$CHANGES" ]; then
echo " (没有改动)"
else
echo "$CHANGES" | head -25 | sed 's/^/ /'
N=$(echo "$CHANGES" | wc -l | tr -d ' ')
[ "$N" -gt 25 ] && echo " ...(共 $N 项)"
fi
echo
if [ "$DRY" = "1" ]; then
echo "==> --dry-run:未做任何修改"
exit 0
fi
# 关键顺序:先把「历史上被跟踪、但现在应忽略」的目录移出索引,再 add。
# 反过来的话,git add -A 会把 bin/obj 的改动重新加回暂存区。
# 用通配匹配任意层级的目录(如 model/xxx/src/bin),不只是仓库根
# ============ 5. 提交信息 ============
if [ -z "$MSG" ]; then
printf '请输入提交信息:'
read -r MSG || MSG=""
fi
if [ -z "$MSG" ]; then
MSG="更新($(date '+%Y-%m-%d %H:%M'))"
echo " (留空,自动生成:$MSG)"
fi
# ============ 6. 最终确认 ============
echo
echo "=============================================="
echo " 分支: $BRANCH"
echo " 信息: $MSG"
echo " 推送到:"
for R in $SELECTED; do
printf ' - %-10s %s\n' "$R" "$(git remote get-url "$R" 2>/dev/null || echo '?')"
done
echo "=============================================="
if [ "$ASSUME_YES" != "1" ]; then
printf '确认提交并推送?(y/N) '
read -r go || go=""
case "$go" in
y|Y) ;;
*) echo "已取消"; exit 0 ;;
esac
fi
# ============ 7. 执行 ============
echo
echo "==> 整理索引"
for d in dist build bin obj .GC; do
TRACKED=$(git ls-files -- "*$d/*" 2>/dev/null | head -1)
if [ -n "$TRACKED" ]; then
COUNT=$(git ls-files -- "*$d/*" 2>/dev/null | wc -l | tr -d ' ')
C=$(git ls-files -- "*$d/*" 2>/dev/null | wc -l | tr -d ' ')
git rm -r --cached --quiet -- "*$d/*" 2>/dev/null || true
# 根目录同名目录也处理一下
git rm -r --cached --quiet -- "$d" 2>/dev/null || true
echo " - 从索引移除 $COUNT 个 $d/ 内的文件(本地保留)"
echo " - 移出 $C 个 $d/ 内的文件(本地保留)"
fi
done
# 再收集其余改动(被忽略的目录不会进来)
git add -A 2>/dev/null || true
STAGED=$(git diff --cached --name-only | wc -l | tr -d ' ')
if [ "$STAGED" = "0" ]; then
echo "==> 没有需要提交的改动"
[ "$PUSH" = "1" ] && [ "$DRY" = "0" ] && { echo "==> 仍尝试推送未推送的提交"; }
echo "==> 没有可提交的改动"
else
echo "==> 待提交 $STAGED 个文件"
git diff --cached --name-status | sed 's/^/ /' | head -30
[ "$STAGED" -gt 30 ] && echo " ...(其余 $((STAGED - 30)) 个略)"
fi
# ---------- 3. 提交 ----------
if [ "$STAGED" != "0" ]; then
if [ -z "$MSG" ]; then
# 自动提交信息:时间 + 主要改动文件类别
KIND=$(git diff --cached --name-only \
| sed 's|/.*||' | sort -u | head -3 | tr '\n' ' ')
MSG="更新 $KIND($(date '+%Y-%m-%d %H:%M'))"
fi
git commit -q -m "$MSG"
echo "==> 已提交:$MSG"
else
echo "==> 跳过提交(无改动)"
fi
# ---------- 4. 推送到所有远程 ----------
if [ "$PUSH" = "0" ]; then
echo "==> -n 指定不推送,结束"
exit 0
fi
REMOTES=$(git remote)
if [ -z "$REMOTES" ]; then
echo "!! 没有配置任何远程仓库,跳过推送"
exit 0
echo "==> 已提交 $STAGED 个文件"
git log --oneline -1 | sed 's/^/ /'
fi
FAILED=0
for R in $REMOTES; do
echo "==> 推送到 $R"
TOTAL=0
for R in $SELECTED; do
TOTAL=$((TOTAL + 1))
echo
echo "==> [$TOTAL] 推送到 $R"
if git push -u "$R" "$BRANCH" 2>&1 | sed 's/^/ /'; then
echo " OK"
else
# 常见情况:远程有本地没有的提交(非快进)
echo " !! 推送失败。若确认要以本地为准,可执行:"
echo " !! 失败。若确认以本地为准:"
echo " git push --force-with-lease $R $BRANCH"
FAILED=$((FAILED + 1))
fi
@@ -136,8 +272,8 @@ done
echo
if [ "$FAILED" -eq 0 ]; then
echo "==> 全部仓库已同步"
echo "==> 完成:$TOTAL 个仓库已同步"
else
echo "==> 完成,但有 $FAILED 个仓库推送失败"
echo "==> 完成,但有 $FAILED / $TOTAL 个仓库推送失败"
exit 1
fi