Some more changes.
This commit is contained in:
@@ -20,8 +20,11 @@ git remote set-url origin "https://${GITEA_TOKEN}@${GITURL}/${GITREPOPATH}"
|
||||
git config user.name "UpdateBot"
|
||||
git config user.email "UpdateBot@localhost.local"
|
||||
|
||||
# stage files
|
||||
git add MirrorListV4 MirrorListV6 OPNS_MirrorListV4 OPNS_MirrorListV6
|
||||
|
||||
# If anything to commit locally, commit it now
|
||||
if ! git diff --quiet; then
|
||||
if ! git diff --quiet --cached; then
|
||||
echo "[$(date)] Committing local changes before pulling"
|
||||
git commit -m "Auto-commit before pull on $(date -Iseconds)"
|
||||
fi
|
||||
@@ -29,9 +32,6 @@ fi
|
||||
# Now pull the latest
|
||||
git pull --rebase --autostash
|
||||
|
||||
# stage files
|
||||
git add MirrorListV4 MirrorListV6
|
||||
|
||||
# Commit and push only if there's anything new staged
|
||||
if git diff --quiet; then
|
||||
echo "[$(date)] No changes to commit."
|
||||
|
||||
Reference in New Issue
Block a user