Repository navigation
Re-drive push doesn't record the pushed sha, so CodeyBox's own push is later refused as a third-party push - #742
Merged
Merged
Conversation
…refusing a moved remote A re-drive push landed on the remote but never updated the item's last-pushed sha, so the next attempt compared the remote at CodeyBox's own new tip against the stale record and misreported it as third-party work (d9951691). Every successful work-branch push is now recorded immediately (latest sha plus bounded history) on all paths — normal push, re-drive retry, lease rewrite, conflict-rework recomposition — including when later PR/merge steps fail, with best-effort confirmation when a completion fails after its push. Before a moved remote is treated as third-party, the push path accepts a tip matching any recorded push or whose exclusive commits all carry this instance's CodeyBox trailers; genuinely foreign tips are still refused without clobbering. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> CodeyBox-Prompt-Revision: 1 Co-Authored-By: CodeyBox <noreply@codeybox.invalid>
…follow-up) The stale-checkpoint discard was unreachable for typed refs: the pre-turn commit is the fork point of the tip and the checkpoint source, which is always an ancestor of the source itself, so the ancestry check never reported stale. Detect the moved base directly (current base tip no longer contained in the checkpoint source's history) and OR it into the discard condition; unresolvable lineage still resumes. Also fix the tests' recompose helper to advance the upstream seed repo instead of pushing bare main directly, which the pickup canonical-base-refresh force-fetch clobbers. Fixes the two StaleCheckpointFreshTurnTests failures. CodeyBox-Prompt-Revision: 1 Co-Authored-By: CodeyBox <noreply@codeybox.invalid>
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.
Automated via CodeyBox — work item a03613b9d2ba4507ae7f8eb37f1fef6e
Initiated by CodeyBox operator
Co-Authored-By: CodeyBox noreply@codeybox.invalid
🤖 Generated with CodeyBox