Skip to content

v4.2.2

Choose a tag to compare

View all tags
@mickume mickume released this 15 Jul 12:54
v4.2.2
be4502c

What's Changed

Bug Fix

  • fix: prevent harvest deadlock when merge agent holds lock during parallel execution

    When running parallel specs, the merge lock acquisition timeout (300s) was shorter than typical merge agent sessions (5–30min). This caused waiting harvesters to time out and left staged-but-uncommitted squash-merge artifacts that blocked all subsequent dispatches.

    Changes:

    • Increase MergeLock default acquisition timeout from 300s to 3600s (matching stale_timeout) so waiters no longer time out while the merge agent is legitimately running
    • Add git reset HEAD in _harvest_under_lock to clear leftover staged changes from prior failed squash merges
    • Fix force_clean_workspace to properly unstage files with git reset HEAD before restoring the working tree — previously git checkout -- . alone could not remediate staged-but-uncommitted files
Assets 2
Loading