From 4f5c4484504b9cb9848bfe0308bdf74653929f61 Mon Sep 17 00:00:00 2001 From: nihilist Date: Wed, 7 May 2025 14:07:37 +0200 Subject: [PATCH] fix entry.sh --- entry.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/entry.sh b/entry.sh index 2daba43..0659b07 100644 --- a/entry.sh +++ b/entry.sh @@ -11,9 +11,13 @@ while true; do git config --global --add safe.directory /repo git config --global --add http.proxy socks5h://localhost:9050 if [ -d "/repo/.git" ]; then - git restore . - git pull origin "${BRANCH}" --recursive --shallow-submodules - git submodule update --recursive --remote + git stash + #git submodule foreach 'git stash; git reset --hard' + #git submodule foreach 'git checkout main ; git pull' + #git restore . + git pull origin "${BRANCH}" + git submodule update --force --recursive --remote --depth=1 + git submodule foreach 'git stash ; git checkout main ; git pull' else git clone -b "${BRANCH}" "${REPO_URL}" /repo --recursive --shallow-submodules --depth=1 git submodule update --recursive --remote