From a1211521eb445ea4ee698679718fa615b5d30d51 Mon Sep 17 00:00:00 2001 From: 2509_92447106 <2509_92447106@noreply.gitcode.com> Date: Sat, 14 Nov 2026 12:46:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8git.sh?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- git.bat | 53 -------- git.sh | 54 --------- gitshell/README.md | 162 ------------------------- gitshell/autogit.bat | 187 ----------------------------- gitshell/autogit.sh | 279 ------------------------------------------- gitshell/status.sh | 45 ------- 6 files changed, 780 deletions(-) delete mode 100644 git.bat delete mode 100755 git.sh delete mode 100644 gitshell/README.md delete mode 100644 gitshell/autogit.bat delete mode 100755 gitshell/autogit.sh delete mode 100755 gitshell/status.sh diff --git a/git.bat b/git.bat deleted file mode 100644 index 9f77dff..0000000 --- a/git.bat +++ /dev/null @@ -1,53 +0,0 @@ -@echo off -REM --------------------------------------------------------------------------- -REM git.bat —— GC 仓库的 git 导航入口(Windows) -REM -REM git.bat 显示帮助(列出 gitshell\ 里所有可用命令) -REM git.bat <命令> [参数] 调用 gitshell\<命令>.bat -REM -REM 例: -REM git.bat autogit 提交并推送到所有已配置的仓库 -REM git.bat autogit -m "修复" 指定提交信息 -REM -REM 实际脚本都在 gitshell\ 里,本文件只负责查找与分发(与 build.ps1 同样的设计)。 -REM --------------------------------------------------------------------------- -setlocal -chcp 65001 >nul 2>&1 - -set "ROOT_DIR=%~dp0" -if "%ROOT_DIR:~-1%"=="\" set "ROOT_DIR=%ROOT_DIR:~0,-1%" -set "SHELL_DIR=%ROOT_DIR%\gitshell" -cd /d "%ROOT_DIR%" - -if "%~1"=="" goto help -if /i "%~1"=="-h" goto help -if /i "%~1"=="--help" goto help -if /i "%~1"=="help" goto help - -set "CMD=%~1" -shift -set "SCRIPT=%SHELL_DIR%\%CMD%.bat" - -if not exist "%SCRIPT%" ( - echo !! 没有这个命令:%CMD% - echo. - goto help - exit /b 1 -) - -call "%SCRIPT%" "%ROOT_DIR%" %* -exit /b %errorlevel% - -:help -echo GC git 工具(gitshell\) -echo. -if exist "%SHELL_DIR%" ( - for %%f in ("%SHELL_DIR%\*.bat") do ( - echo %%~nf - ) -) else ( - echo (gitshell\ 目录不存在) -) -echo. -echo 用法:git.bat ^<命令^> [参数] -exit /b 0 diff --git a/git.sh b/git.sh deleted file mode 100755 index c8c125d..0000000 --- a/git.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/sh -# --------------------------------------------------------------------------- -# git.sh —— GC 仓库的 git 导航入口 -# -# ./git.sh 显示帮助(列出 gitshell/ 里所有可用命令) -# ./git.sh <命令> [参数] 调用 gitshell/<命令>.sh -# -# 例: -# ./git.sh autogit 提交并推送到所有已配置的仓库 -# ./git.sh autogit -m "修复" 指定提交信息 -# -# 实际脚本都在 gitshell/ 里,本文件只负责查找与分发(与 build.sh 同样的设计)。 -# --------------------------------------------------------------------------- -set -eu - -ROOT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) -cd "$ROOT_DIR" - -SHELL_DIR="$ROOT_DIR/gitshell" - -list_commands() { - echo "GC git 工具(gitshell/)" - echo - if [ -d "$SHELL_DIR" ]; then - for f in "$SHELL_DIR"/*.sh; do - [ -f "$f" ] || continue - name=$(basename "$f" .sh) - # 取文件头第一条「# 描述」行(跳过 shebang 与空注释) - desc=$(sed -n '2,6p' "$f" | sed -n 's/^# *\(.\)/\1/p' | grep -v '^$' | head -1) - printf ' %-14s %s\n' "$name" "${desc:-}" - done - else - echo " (gitshell/ 目录不存在)" - fi - echo - echo "用法:./git.sh <命令> [参数]" -} - -CMD="${1:-}" -[ -n "$CMD" ] || { list_commands; exit 0; } -case "$CMD" in - -h|--help|help) list_commands; exit 0 ;; -esac -shift 2>/dev/null || true - -SCRIPT="$SHELL_DIR/$CMD.sh" -if [ ! -f "$SCRIPT" ]; then - echo "!! 没有这个命令:$CMD" - echo - list_commands - exit 1 -fi - -exec sh "$SCRIPT" "$ROOT_DIR" "$@" diff --git a/gitshell/README.md b/gitshell/README.md deleted file mode 100644 index d4aad82..0000000 --- a/gitshell/README.md +++ /dev/null @@ -1,162 +0,0 @@ -# git 工具(gitshell/) - -仓库的 git 操作入口。与 `build.sh` / `build.ps1` 同样的设计:根目录只放一个薄入口, -实际脚本都在 `gitshell/` 里。 - -## 入口 - -| 平台 | 文件 | -| --- | --- | -| macOS / Linux | `./git.sh` | -| Windows | `git.bat` | - -不带参数运行会列出所有可用命令。 - -```bash -./git.sh # 显示帮助 -./git.sh status # 查看状态 -./git.sh autogit # 提交并推送 -``` - -## autogit —— 交互式提交(支持多仓库) - -```bash -./git.sh autogit -``` - -交互顺序: - -**① 选择仓库(可多选)** - -``` -已配置的仓库: - 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.sh autogit -m "修复渲染卡顿" # 跳过信息输入 -./git.sh autogit --dry-run # 只看不动 -./git.sh autogit -y -m "信息" # 全自动 -``` - -## status —— 状态速览 - -```bash -./git.sh status -``` - -显示当前分支、改动数量、最近提交,以及每个远程的领先/落后情况。 - -## 常见情况 - -**提交了但忘了排除构建产物** - -```bash -git rm -r --cached -- '*bin/*' '*obj/*' -git commit -m "移除构建产物" -``` - -**远程有别人的提交,推不上去** - -```bash -git pull --rebase origin main -./git.sh autogit -``` - -若确认以本地为准(会覆盖远程历史,慎用): - -```bash -git push --force-with-lease origin main -``` - -**想确认没有把不该提交的东西加进去** - -```bash -./git.sh autogit --dry-run -``` diff --git a/gitshell/autogit.bat b/gitshell/autogit.bat deleted file mode 100644 index 93e4028..0000000 --- a/gitshell/autogit.bat +++ /dev/null @@ -1,187 +0,0 @@ -@echo off -REM autogit.bat —— 交互式提交(Windows) -REM -REM 用法: -REM git.bat autogit 交互模式(推荐) -REM git.bat autogit -m "信息" 跳过信息输入,其余仍交互 -REM git.bat autogit --dry-run 只看会提交什么,不动仓库 -REM git.bat autogit -y 全部确认跳过(配合 -m 可全自动) -REM -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 !! 目录不存在 & exit /b 1) -shift - -set "MSG=" -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"=="--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 - -REM ---------- 0. 前置检查 ---------- -git rev-parse --git-dir >nul 2>&1 -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 ) - -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 - -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\ 内的文件(本地保留) - 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 ==^> 没有可提交的改动 -) else ( - git commit -q -m "%MSG%" - echo ==^> 已提交 %STAGED% 个文件 - git log --oneline -1 -) - -REM ---------- 6. 推送 ---------- -if "%PUSH%"=="0" ( - echo. - echo ==^> 仅本地提交,未推送 - exit /b 0 -) - -set "FAILED=0" -for %%r in (!SELECTED!) do ( - echo. - echo ==^> 推送到 %%r - git push -u %%r "%BRANCH%" 2>&1 - if errorlevel 1 ( - echo !! 失败。若确认以本地为准: - echo git push --force-with-lease %%r %BRANCH% - set "FAILED=1" - ) else ( - echo OK - ) -) - -echo. -if "%FAILED%"=="1" ( - echo ==^> 完成,有仓库推送失败 - exit /b 1 -) -echo ==^> 全部完成 -exit /b 0 diff --git a/gitshell/autogit.sh b/gitshell/autogit.sh deleted file mode 100755 index 754ee15..0000000 --- a/gitshell/autogit.sh +++ /dev/null @@ -1,279 +0,0 @@ -#!/bin/sh -# autogit —— 交互式提交:仓库 → 地址 → 分支 → 信息 → 确认 → 执行 -# -# 用法: -# ./git.sh autogit 交互模式 -# ./git.sh autogit --dry-run 只看会提交什么,不动仓库 -# -# 交互流程(严格按此顺序): -# 1. 选择要提交到哪个仓库(或直接输入仓库地址) -# 2. 确认该仓库地址 -# 3. 确认提交分支(可改成其它分支) -# 4. 输入提交信息 -# 5. 汇总确认后执行 -# -# 自动跳过:dist/ build/ bin/ obj/ .GC/ node_modules/(任意层级) -# --------------------------------------------------------------------------- -set -eu - -ROOT_DIR="${1:-.}" -shift 2>/dev/null || true -cd "$ROOT_DIR" - -DRY=0 -ASSUME_YES=0 -MSG="" -while [ $# -gt 0 ]; do - case "$1" in - -m|--message) MSG="${2:-}"; shift 2 ;; - --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 - -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" - -# ============ 1. 选择仓库(支持多个)============ -echo "==============================================" -echo " 仓库目录:$(pwd)" -echo " 当前分支:$CUR_BRANCH" -echo "==============================================" -echo - -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 " 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 - -# ============ 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 - 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 " - 移出 $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 "==> 没有可提交的改动" -else - git commit -q -m "$MSG" - echo "==> 已提交 $STAGED 个文件" - git log --oneline -1 | sed 's/^/ /' -fi - -FAILED=0 -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 " git push --force-with-lease $R $BRANCH" - FAILED=$((FAILED + 1)) - fi -done - -echo -if [ "$FAILED" -eq 0 ]; then - echo "==> 完成:$TOTAL 个仓库已同步" -else - echo "==> 完成,但有 $FAILED / $TOTAL 个仓库推送失败" - exit 1 -fi diff --git a/gitshell/status.sh b/gitshell/status.sh deleted file mode 100755 index 78fbeb9..0000000 --- a/gitshell/status.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/sh -# status —— 一眼看清所有仓库的同步状态 -# -# 用法:./git.sh status -# -# 显示:当前分支、改动文件、与每个远程的领先/落后关系。 - -set -eu -ROOT_DIR="${1:-.}" -cd "$ROOT_DIR" - -git rev-parse --git-dir >/dev/null 2>&1 || { echo "!! 不是 git 仓库"; exit 1; } - -BRANCH=$(git rev-parse --abbrev-ref HEAD) -echo "仓库:$(pwd)" -echo "分支:$BRANCH" -echo - -CHANGED=$(git status --porcelain | wc -l | tr -d ' ') -if [ "$CHANGED" = "0" ]; then - echo "工作区:干净" -else - echo "工作区:$CHANGED 处改动" - git status --short | head -15 | sed 's/^/ /' - [ "$CHANGED" -gt 15 ] && echo " ...(其余 $((CHANGED - 15)) 处略)" -fi -echo - -# 最近提交 -echo "最近提交:" -git log --oneline -3 | sed 's/^/ /' -echo - -# 每个远程的同步状态 -echo "远程仓库:" -for R in $(git remote); do - URL=$(git remote get-url "$R" 2>/dev/null || echo "?") - AHEAD=$(git rev-list --count "origin/$BRANCH..HEAD" 2>/dev/null || echo "?") - BEHIND=$(git rev-list --count "HEAD..origin/$BRANCH" 2>/dev/null || echo "?") - if [ "$R" = "origin" ] && [ "$AHEAD" != "?" ]; then - printf ' %-10s 领先 %s / 落后 %s %s\n' "$R" "$AHEAD" "$BEHIND" "$URL" - else - printf ' %-10s %s\n' "$R" "$URL" - fi -done