disinto-admin/disinto
1
0
Fork 0
Code Issues 15 Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request 'fix: fix: entrypoint-llama.sh should reset base repo to origin/main on startup (#336)' (#350) from fix/issue-336 into main
All checks were successful
ci/woodpecker/push/ci Pipeline was successful
Details

Browse source
This commit is contained in:
dev-qwen 2026-04-07 11:52:19 +00:00
commit 8f58f834d5
1 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
docker/agents/entrypoint-llama.sh
View file

@ -28,6 +28,15 @@ if [ ! -d "${PROJECT_REPO_ROOT}/.git" ]; then
log "Repo cloned" log "Repo cloned"
fi fi
# Reset base repo to origin/main to avoid divergence warnings
su -s /bin/bash agent -c "
cd \"${PROJECT_REPO_ROOT}\"
git fetch origin main
git checkout main 2>/dev/null || true
git reset --hard origin/main
" || true
log "Base repo reset to origin/main"
log "Entering poll loop (interval: ${POLL_INTERVAL:-300}s)" log "Entering poll loop (interval: ${POLL_INTERVAL:-300}s)"
while true; do while true; do