Repository navigation
Fix claims against another clone's unpushed commits - #28
Merged
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.
Real commits written to the store now carry the issuing clone's host, user and clone path, as the Python implementation stamped them. Without the user field the spread logic routed every stored commit through the git log branch, so another clone's unpushed commit on the same branch rendered as
MINE_ACTIVE_BRANCHandclaimlet it through.A store record whose commit has since reached a remote branch is demoted to a plain remote commit when read. The issuing clone only rewrites its records on its next update, so the record lingers after a push.
is_uncommitted_changeskeys off the missing sha instead of the user field.Adds spread tests for the previously unreachable
THEIR_*andMINE_OTHER_BRANCHflags, two-clone claim tests for the blocked and pushed cases, and the matching lifecycle steps.