Resolve git locks before fetch and reset#2308
Merged
hiroshinishio merged 2 commits intomainfrom Feb 22, 2026
Merged
Conversation
Add wait_for_git_locks that polls every 2s up to 60s for fresh locks held by concurrent Lambda invocations, then force-removes on timeout.
Merged remove_stale_git_locks (sync) and wait_for_git_locks (async) into one resolve_git_locks function that handles both stale removal and fresh lock polling. Renamed file to match function name.
hiroshinishio
changed the title
hiroshinishio
changed the title
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
remove_stale_git_locks(sync, stale lock removal) andwait_for_git_locks(async, fresh lock polling) into a singleresolve_git_locksasync functionremove_stale_git_locks.pytoresolve_git_locks.pyto match the function namegit_reset.pythat was reimplementing the same patternwait_for_git_locks.pyfileThe consolidated function handles both cases in one pass: