fix(digest): explicit force-with-lease in rebaser push - #9
Merged
Conversation
Bare --force-with-lease reports '! [rejected] (stale info)' against a tracking ref that was set via an explicit-refspec fetch, so all 19 clean ddmrp rebases failed to push. Pin the lease to the sha we just fetched (refs/heads/<b>:<oid>) — keeps the race guard, drops the false stale. Test asserts the explicit-lease push form.
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.
Run #2 of the digest rebased all 16 ddmrp MIG branches + 3 fixes cleanly, but every push was rejected with
! [rejected] (stale info)— a bare--force-with-leasefalse-positive against a tracking ref populated by an explicit-refspec fetch (not auth, not the PAT). Pin the lease to the exact sha we fetched (refs/heads/<b>:<oid>): same race protection, no false stale. Regression test pins the explicit-lease push form. (319.0-fix-*branches separately conflict intest_ddmrp.py— manual triage, likely already-superseded fix branches.)