YuruC3/Debain-repos
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Edits for gitPush so that it works.

Browse Source 
Again. :(
This commit is contained in:
YuruC3 2025-07-02 00:05:40 +02:00
parent 75cb35b954
commit 8c61f4a51c
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
docker/gitPush.sh
View File

@ -12,6 +12,15 @@ if [ ! -d "$REPO_DIR/.git" ]; then
fi fi
cd "$REPO_DIR" cd "$REPO_DIR"
# Abort previous rebase/cherry-pick if stuck
git rebase --abort 2>/dev/null || true
git cherry-pick --abort 2>/dev/null || true
# Make sure we're on a clean 'main'
git checkout main || git checkout -b main origin/main
git pull --rebase --autostash
git remote set-url origin "https://${GITEA_TOKEN}@${GITURL}/${GITREPOPATH}" git remote set-url origin "https://${GITEA_TOKEN}@${GITURL}/${GITREPOPATH}"
@ -25,7 +34,7 @@ git add MirrorListV4 MirrorListV6 OPNS_MirrorListV4 OPNS_MirrorListV6
if ! git diff --quiet --cached; then if ! git diff --quiet --cached; then
echo "[$(date)] Committing and pushing changes..." echo "[$(date)] Committing and pushing changes..."
git commit -m "Auto-update mirror list on $(date -Iseconds)" git commit -m "Auto-update mirror list on $(date -Iseconds)"
git pull --rebase --autostash # git pull --rebase --autostash
git push --quiet git push --quiet
echo "[$(date)] Changes pushed." echo "[$(date)] Changes pushed."
else else