Fix force-with-lease safety bypass caused by pre-push fetch#42
Merged
Conversation
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
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
Prevent
stck pushfrom silently overwriting remote commits when--force-with-leaseis neutralized by a priorgit fetch origin.run_pushcallsgitops::fetch_origin()beforegitops::push_force_with_lease(), which updates remote tracking refs to match the actual remote. Since--force-with-lease(without an explicit expected SHA) checks against those tracking refs, the safety check always passes after a fresh fetch — even when the remote has commits the local branch doesn't contain. This adds a pre-push ancestor check using the existinggitops::is_ancestor()helper: before each force push, verify thatorigin/<branch>is an ancestor of the local<branch>. If not, abort with a clear error telling the user to integrate remote changes first.Changelist
src/commands.rs— Add ancestry guard in therun_pushloop before eachpush_force_with_leasecalltests/push.rs— Addpush_aborts_when_remote_has_commits_not_in_local_branchintegration testtests/harness/mod.rs— AddSTCK_TEST_NOT_ANCESTOR_PAIRSenv var support and self-identity ancestor rule to git stubChecklist
error: