chore: 以本地为准,上传全部并替换 GitHub
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
#!/bin/bash
|
||||
# 以本地为准:上传本地全部文件,强制替换 GitHub 上 v0/fnvtk-5efaab9c(不拉取、不改本地)
|
||||
# 以本地为准:上传本地全部文件到 GitHub 与 Gitea(不拉取、不改本地)
|
||||
# 在终端执行: bash scripts/push-to-github.sh
|
||||
|
||||
set -e
|
||||
@@ -18,6 +18,9 @@ else
|
||||
echo "已从卡若AI 读取 Token"
|
||||
fi
|
||||
|
||||
GITEA_TOKEN="07f82fbd81a64fb714d9a6c47b11cc5b98f2fa2e"
|
||||
GITEA_URL="http://fnvtk:${GITEA_TOKEN}@open.quwanzhi.com:3000/fnvtk/users.git"
|
||||
|
||||
echo "=== 1. 当前状态(本地分支) ==="
|
||||
git status
|
||||
echo ""
|
||||
@@ -36,10 +39,32 @@ else
|
||||
fi
|
||||
echo ""
|
||||
|
||||
echo "=== 4. 强制推送到 GitHub,覆盖 v0/fnvtk-5efaab9c ==="
|
||||
echo "=== 4. 推送到 GitHub main ==="
|
||||
git push "$PUSH_URL" HEAD:main
|
||||
echo ""
|
||||
|
||||
echo "=== 5. 强制推送到 GitHub v0/fnvtk-5efaab9c ==="
|
||||
# 当前分支(HEAD)覆盖远程 v0/fnvtk-5efaab9c,重叠处一律以本地为准
|
||||
git push --force "$PUSH_URL" HEAD:v0/fnvtk-5efaab9c
|
||||
echo ""
|
||||
|
||||
echo "=== 6. 确保 Gitea 仓库存在 ==="
|
||||
curl -u "fnvtk:zhiqun1984" -X POST "http://open.quwanzhi.com:3000/api/v1/user/repos" \
|
||||
-H "Content-Type: application/json" \
|
||||
-d '{"name":"users","description":"神射手 users 仓库","private":false}' || true
|
||||
echo ""
|
||||
|
||||
echo "=== 7. 配置并推送到 Gitea main ==="
|
||||
if git remote get-url gitea >/dev/null 2>&1; then
|
||||
git remote set-url gitea "$GITEA_URL"
|
||||
else
|
||||
git remote add gitea "$GITEA_URL"
|
||||
fi
|
||||
unset HTTP_PROXY HTTPS_PROXY ALL_PROXY
|
||||
GIT_HTTP_VERSION=HTTP/1.1 git push -u gitea HEAD:main
|
||||
echo ""
|
||||
|
||||
echo "=== 完成 ==="
|
||||
echo "GitHub 已与本地一致: https://github.com/fnvtk/users/tree/v0/fnvtk-5efaab9c"
|
||||
echo "GitHub main: https://github.com/fnvtk/users/tree/main"
|
||||
echo "GitHub v0: https://github.com/fnvtk/users/tree/v0/fnvtk-5efaab9c"
|
||||
echo "Gitea: http://open.quwanzhi.com:3000/fnvtk/users"
|
||||
|
||||
Reference in New Issue
Block a user