From acda1f72bb9c1446296772d0a0a93c6a72da21cf Mon Sep 17 00:00:00 2001 From: openhands Date: Wed, 18 Mar 2026 14:27:21 +0000 Subject: [PATCH] fix: add sleep before continue in stale-patch error path to avoid busy loop (#866) When git apply --check fails, the daemon now sleeps 300s before retrying, preventing a tight busy loop that would hammer the git remote indefinitely. Co-Authored-By: Claude Sonnet 4.6 --- tools/push3-evolution/evolution-daemon.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/push3-evolution/evolution-daemon.sh b/tools/push3-evolution/evolution-daemon.sh index 1e969fe..262ab38 100755 --- a/tools/push3-evolution/evolution-daemon.sh +++ b/tools/push3-evolution/evolution-daemon.sh @@ -190,7 +190,8 @@ while true; do log "[2/7] Applying evolution patches…" if ! (cd "$REPO_ROOT" && git apply --check "$PATCH_FILE"); then log " ERROR: evolution.patch needs regeneration — see tools/push3-evolution/evolution.conf" - log " Skipping run (patch does not apply to current tree)." + log " Skipping run (patch does not apply to current tree). Sleeping 300s before retry…" + sleep 300 continue fi if (cd "$REPO_ROOT" && git apply "$PATCH_FILE"); then