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