修复一些文件
This commit is contained in:
1 parent
f1787dff9d
commit
9293fee3bf
3 files changed
+439
-164
No files matched your search
+98
-33
@@ -18,48 +18,113 @@
|
||||
./git.sh autogit # 提交并推送
|
||||
```
|
||||
|
||||
## autogit —— 一键多仓提交
|
||||
|
||||
提交当前改动,并推送到 **所有** 已配置的远程仓库。
|
||||
## autogit —— 交互式提交(支持多仓库)
|
||||
|
||||
```bash
|
||||
./git.sh autogit # 自动生成提交信息
|
||||
./git.sh autogit -m "修复渲染卡顿" # 指定提交信息
|
||||
./git.sh autogit -n # 只提交,不推送
|
||||
./git.sh autogit --dry-run # 只看会提交什么,不动仓库
|
||||
./git.sh autogit
|
||||
```
|
||||
|
||||
### 多仓库
|
||||
交互顺序:
|
||||
|
||||
脚本遍历 `git remote` 里的每个远程依次 push:
|
||||
**① 选择仓库(可多选)**
|
||||
|
||||
```
|
||||
已配置的仓库:
|
||||
1) origin git@gitcode.com:2509_92447106/GC.git
|
||||
2) gitee git@github.com:user/GC.git
|
||||
|
||||
a) 全部
|
||||
n) 添加新仓库地址
|
||||
|
||||
请选择(可多选,用空格或逗号分隔,如 1 3 或 a 或 n;默认 1):
|
||||
```
|
||||
|
||||
支持的输入:
|
||||
|
||||
| 输入 | 含义 |
|
||||
| --- | --- |
|
||||
| `1` | 第 1 个仓库 |
|
||||
| `1 3` / `1,3` / `1、3` | 同时选第 1 和第 3 个 |
|
||||
| `a` | 全部仓库 |
|
||||
| `n` | 添加新地址(**可连续输入多个,空行结束**) |
|
||||
|
||||
选 `n` 时可以一次加好几个:
|
||||
|
||||
```
|
||||
可以连续输入多个地址,每行一个,输入空行结束:
|
||||
地址: git@gitcode.com:user/GC.git
|
||||
给这个仓库起个名字(回车自动命名): origin
|
||||
已添加 origin -> git@gitcode.com:user/GC.git
|
||||
地址: git@github.com:user/GC-mirror.git
|
||||
给这个仓库起个名字(回车自动命名): mirror
|
||||
已添加 mirror -> git@github.com:user/GC-mirror.git
|
||||
地址: ← 空行结束
|
||||
```
|
||||
|
||||
**② 确认仓库地址**
|
||||
|
||||
```
|
||||
目标仓库(共 2 个):
|
||||
origin git@gitcode.com:2509_92447106/GC.git
|
||||
mirror git@github.com:user/GC-mirror.git
|
||||
----------------------------------------------
|
||||
以上地址都正确吗?(Y/n)
|
||||
```
|
||||
|
||||
答 `n` 会逐个询问新地址,直接回车表示不改。
|
||||
|
||||
**③ 确认分支**
|
||||
|
||||
```
|
||||
提交分支(当前 main,直接回车沿用,或输入其它分支名):
|
||||
----------------------------------------------
|
||||
提交分支:main
|
||||
----------------------------------------------
|
||||
分支正确吗?(Y/n)
|
||||
```
|
||||
|
||||
输入其它名字时,不存在会自动创建并切换。
|
||||
|
||||
**④ 输入提交信息**
|
||||
|
||||
```
|
||||
请输入提交信息:修复渲染卡顿
|
||||
```
|
||||
|
||||
留空则自动生成 `更新(日期 时间)`。
|
||||
|
||||
**⑤ 最终确认**
|
||||
|
||||
```
|
||||
==============================================
|
||||
分支: main
|
||||
信息: 修复渲染卡顿
|
||||
推送到:
|
||||
- origin git@gitcode.com:2509_92447106/GC.git
|
||||
- mirror git@github.com:user/GC-mirror.git
|
||||
==============================================
|
||||
确认提交并推送?(y/N)
|
||||
```
|
||||
|
||||
确认后逐个推送,最后汇总:
|
||||
|
||||
```
|
||||
==> [1] 推送到 origin
|
||||
OK
|
||||
==> [2] 推送到 mirror
|
||||
OK
|
||||
|
||||
==> 完成:2 个仓库已同步
|
||||
```
|
||||
|
||||
参数:
|
||||
|
||||
```bash
|
||||
# 查看现有远程
|
||||
git remote -v
|
||||
|
||||
# 追加一个仓库(之后 autogit 会同时推它)
|
||||
git remote add gitee git@github.com:user/GC.git
|
||||
git remote add backup git@gitcode.com:user/GC-backup.git
|
||||
./git.sh autogit -m "修复渲染卡顿" # 跳过信息输入
|
||||
./git.sh autogit --dry-run # 只看不动
|
||||
./git.sh autogit -y -m "信息" # 全自动
|
||||
```
|
||||
|
||||
推送失败时(通常是远程有本地没有的提交),脚本会提示:
|
||||
|
||||
```
|
||||
git push --force-with-lease <remote> main
|
||||
```
|
||||
|
||||
### 自动跳过
|
||||
|
||||
这些目录**永远不会被提交**(新增的由 `.gitignore` 挡住,历史上被跟踪的会先从索引移除,
|
||||
本地文件保留):
|
||||
|
||||
```
|
||||
dist/ build/ bin/ obj/ .GC/ node_modules/
|
||||
```
|
||||
|
||||
脚本按 `*bin/*`、`*obj/*` 这样的通配匹配**任意层级**,
|
||||
所以 `model/earth-geography/src/bin/` 这类嵌套构建产物同样会被排除。
|
||||
|
||||
## status —— 状态速览
|
||||
|
||||
```bash
|
||||
|
||||
+123
-49
@@ -1,35 +1,33 @@
|
||||
@echo off
|
||||
REM autogit.bat —— 提交并推送到所有已配置的仓库(Windows 版一键多仓同步)
|
||||
REM autogit.bat —— 交互式提交(Windows)
|
||||
REM
|
||||
REM 用法:
|
||||
REM git.bat autogit 自动生成提交信息并推送所有仓库
|
||||
REM git.bat autogit -m "提交信息" 指定提交信息
|
||||
REM git.bat autogit -m "..." -n 只提交,不推送
|
||||
REM git.bat autogit --dry-run 只看会提交什么,不动仓库
|
||||
REM git.bat autogit 交互模式(推荐)
|
||||
REM git.bat autogit -m "信息" 跳过信息输入,其余仍交互
|
||||
REM git.bat autogit --dry-run 只看会提交什么,不动仓库
|
||||
REM git.bat autogit -y 全部确认跳过(配合 -m 可全自动)
|
||||
REM
|
||||
REM 多仓库:遍历 git remote 里的每一个远程,依次 push。
|
||||
REM 加仓库: git remote add gitee git@github.com:user/repo.git
|
||||
REM
|
||||
REM 自动跳过(永不提交):dist\ build\ bin\ obj\ .GC\ node_modules\ 等
|
||||
REM 交互流程:显示改动 → 逐个选仓库 → 输入提交信息 → 确认 → 执行
|
||||
REM 自动跳过:dist\ build\ bin\ obj\ .GC\(任意层级)
|
||||
|
||||
setlocal enabledelayedexpansion
|
||||
chcp 65001 >nul 2>&1
|
||||
|
||||
set "ROOT_DIR=%~1"
|
||||
if "%ROOT_DIR%"=="" set "ROOT_DIR=%CD%"
|
||||
cd /d "%ROOT_DIR%" 2>nul || (echo !! 目录不存在:%ROOT_DIR% & exit /b 1)
|
||||
cd /d "%ROOT_DIR%" 2>nul || (echo !! 目录不存在 & exit /b 1)
|
||||
shift
|
||||
|
||||
set "MSG="
|
||||
set "PUSH=1"
|
||||
set "DRY=0"
|
||||
set "ASSUME_YES=0"
|
||||
:parse
|
||||
if "%~1"=="" goto parsed
|
||||
if /i "%~1"=="-m" ( set "MSG=%~2" & shift & shift & goto parse )
|
||||
if /i "%~1"=="--message" ( set "MSG=%~2" & shift & shift & goto parse )
|
||||
if /i "%~1"=="-n" ( set "PUSH=0" & shift & goto parse )
|
||||
if /i "%~1"=="--no-push" ( set "PUSH=0" & shift & goto parse )
|
||||
if /i "%~1"=="--dry-run" ( set "DRY=1" & shift & goto parse )
|
||||
if /i "%~1"=="-y" ( set "ASSUME_YES=1" & shift & goto parse )
|
||||
if /i "%~1"=="--yes" ( set "ASSUME_YES=1" & shift & goto parse )
|
||||
echo 未知参数:%~1
|
||||
exit /b 1
|
||||
:parsed
|
||||
@@ -41,62 +39,138 @@ if errorlevel 1 ( echo !! 这里不是 git 仓库:%CD% & exit /b 1 )
|
||||
for /f "delims=" %%b in ('git rev-parse --abbrev-ref HEAD 2^>nul') do set "BRANCH=%%b"
|
||||
if "%BRANCH%"=="" ( echo !! 当前不在任何分支上 & exit /b 1 )
|
||||
|
||||
REM ---------- 1. 确保忽略规则 ----------
|
||||
if exist ".gitignore" (
|
||||
for %%p in ("dist/" "build/" "bin/" "obj/" ".GC/") do (
|
||||
findstr /x /c:%%p ".gitignore" >nul 2>&1
|
||||
if errorlevel 1 (
|
||||
echo %%p>>".gitignore"
|
||||
echo + .gitignore 追加 %%~p
|
||||
set "REMOTES="
|
||||
for /f "delims=" %%r in ('git remote') do set "REMOTES=!REMOTES! %%r"
|
||||
if "!REMOTES!"=="" ( echo !! 没有配置任何远程仓库 & exit /b 1 )
|
||||
|
||||
echo ==============================================
|
||||
echo 仓库:%CD%
|
||||
echo 分支:%BRANCH%
|
||||
echo ==============================================
|
||||
echo.
|
||||
|
||||
echo ==^> 会被排除的构建产物:
|
||||
for %%d in (dist build bin obj .GC) do (
|
||||
for /f %%c in ('git ls-files -- "*%%d/*" 2^>nul ^| find /c /v ""') do (
|
||||
if not "%%c"=="0" echo %%d\ %%c 个文件
|
||||
)
|
||||
)
|
||||
echo.
|
||||
|
||||
echo ==^> 待提交的改动:
|
||||
git status --short | findstr /v /r "\\dist\\ \\build\\ \\bin\\ \\obj\\ \\.GC\\" | more +0
|
||||
echo.
|
||||
|
||||
if "%DRY%"=="1" (
|
||||
echo ==^> --dry-run:未做任何修改
|
||||
exit /b 0
|
||||
)
|
||||
|
||||
REM ---------- 2. 选择仓库 ----------
|
||||
echo ==^> 选择要推送的仓库(y=推送 / n=跳过 / a=全部 / q=退出)
|
||||
echo.
|
||||
for %%r in (!REMOTES!) do (
|
||||
for /f "delims=" %%u in ('git remote get-url %%r 2^>nul') do echo %%r %%u
|
||||
)
|
||||
echo.
|
||||
|
||||
set "SELECTED="
|
||||
for %%r in (!REMOTES!) do (
|
||||
if "!ASSUME_YES!"=="1" (
|
||||
set "SELECTED=!SELECTED! %%r"
|
||||
echo [自动] %%r
|
||||
) else (
|
||||
set "ANS="
|
||||
set /p "ANS= 推送到 %%r (y/n/a/q) "
|
||||
if /i "!ANS!"=="a" (
|
||||
set "SELECTED=!REMOTES!"
|
||||
goto selected_done
|
||||
) else if /i "!ANS!"=="q" (
|
||||
echo 已取消
|
||||
exit /b 0
|
||||
) else if /i "!ANS!"=="y" (
|
||||
set "SELECTED=!SELECTED! %%r"
|
||||
echo -^> 推送
|
||||
) else (
|
||||
echo -^> 跳过
|
||||
)
|
||||
)
|
||||
)
|
||||
:selected_done
|
||||
|
||||
REM ---------- 2. 收集改动 ----------
|
||||
echo ==^> 检查改动(分支 %BRANCH%)
|
||||
git add -A 2>nul
|
||||
set "PUSH=1"
|
||||
if "!SELECTED!"=="" (
|
||||
echo.
|
||||
echo !! 没有选择任何仓库,只提交到本地不推送
|
||||
set "PUSH=0"
|
||||
)
|
||||
|
||||
REM ---------- 3. 提交信息 ----------
|
||||
echo.
|
||||
if "%MSG%"=="" (
|
||||
echo ==^> 请输入提交信息(留空自动生成)
|
||||
set "MSG="
|
||||
set /p "MSG= ^> "
|
||||
)
|
||||
if "%MSG%"=="" (
|
||||
for /f "tokens=1-3 delims=/ " %%a in ('date /t') do set "D=%%a-%%b-%%c"
|
||||
set "MSG=更新项目(!D!)"
|
||||
echo (自动生成:!MSG!)
|
||||
)
|
||||
|
||||
REM ---------- 4. 确认 ----------
|
||||
echo.
|
||||
echo ==============================================
|
||||
echo 提交信息:%MSG%
|
||||
if "%PUSH%"=="1" (
|
||||
echo 推送到: !SELECTED!
|
||||
) else (
|
||||
echo 推送到: (仅本地提交)
|
||||
)
|
||||
echo ==============================================
|
||||
if not "%ASSUME_YES%"=="1" (
|
||||
set "OK="
|
||||
set /p "OK=确认执行?(y/N) "
|
||||
if /i not "!OK!"=="y" ( echo 已取消 & exit /b 0 )
|
||||
)
|
||||
|
||||
REM ---------- 5. 执行 ----------
|
||||
echo.
|
||||
echo ==^> 整理索引
|
||||
for %%d in (dist build bin obj .GC) do (
|
||||
for /f "delims=" %%f in ('git ls-files "%%d" 2^>nul') do (
|
||||
git rm -r --cached --quiet "%%d" 2>nul
|
||||
echo - 从索引移除 %%d\(本地文件保留)
|
||||
for /f "delims=" %%f in ('git ls-files -- "*%%d/*" 2^>nul') do (
|
||||
git rm -r --cached --quiet -- "*%%d/*" 2>nul
|
||||
echo - 移出 %%d\ 内的文件(本地保留)
|
||||
goto nextdir_%%d
|
||||
)
|
||||
:nextdir_%%d
|
||||
)
|
||||
|
||||
git add -A 2>nul
|
||||
|
||||
for /f %%n in ('git diff --cached --name-only ^| find /c /v ""') do set "STAGED=%%n"
|
||||
if "%STAGED%"=="0" (
|
||||
echo ==^> 没有需要提交的改动
|
||||
echo ==^> 没有可提交的改动
|
||||
) else (
|
||||
echo ==^> 待提交 %STAGED% 个文件
|
||||
git commit -q -m "%MSG%"
|
||||
echo ==^> 已提交 %STAGED% 个文件
|
||||
git log --oneline -1
|
||||
)
|
||||
|
||||
if "%DRY%"=="1" (
|
||||
echo ==^> --dry-run:到此为止
|
||||
REM ---------- 6. 推送 ----------
|
||||
if "%PUSH%"=="0" (
|
||||
echo.
|
||||
echo ==^> 仅本地提交,未推送
|
||||
exit /b 0
|
||||
)
|
||||
|
||||
REM ---------- 3. 提交 ----------
|
||||
if not "%STAGED%"=="0" (
|
||||
if "%MSG%"=="" (
|
||||
for /f "tokens=1-3 delims=/ " %%a in ('date /t') do set "D=%%a-%%b-%%c"
|
||||
set "MSG=更新项目(!D!)"
|
||||
)
|
||||
git commit -q -m "%MSG%"
|
||||
echo ==^> 已提交:%MSG%
|
||||
) else (
|
||||
echo ==^> 跳过提交(无改动)
|
||||
)
|
||||
|
||||
REM ---------- 4. 推送到所有远程 ----------
|
||||
if "%PUSH%"=="0" ( echo ==^> -n 指定不推送 & exit /b 0 )
|
||||
|
||||
for /f "delims=" %%r in ('git remote') do (
|
||||
set "FAILED=0"
|
||||
for %%r in (!SELECTED!) do (
|
||||
echo.
|
||||
echo ==^> 推送到 %%r
|
||||
git push -u %%r "%BRANCH%" 2>&1
|
||||
if errorlevel 1 (
|
||||
echo !! 推送失败。若确认以本地为准:
|
||||
echo !! 失败。若确认以本地为准:
|
||||
echo git push --force-with-lease %%r %BRANCH%
|
||||
set "FAILED=1"
|
||||
) else (
|
||||
@@ -106,8 +180,8 @@ for /f "delims=" %%r in ('git remote') do (
|
||||
|
||||
echo.
|
||||
if "%FAILED%"=="1" (
|
||||
echo ==^> 完成,但有仓库推送失败
|
||||
echo ==^> 完成,有仓库推送失败
|
||||
exit /b 1
|
||||
)
|
||||
echo ==^> 全部仓库已同步
|
||||
echo ==^> 全部完成
|
||||
exit /b 0
|
||||
+218
-82
@@ -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
|
||||
Reference in new issue
Block a user