More correct reference updating #414
Merged
Conversation
This file contains 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
This new method is Reference.set_target() which in addition lets you specify what to use in the reflog.
We do not want this as it is riddled with race conditions.
Updating the target of a reference is not like setting a property. It involves appending to the reflog under the same lock, so we must do it all the same time. Thus setting the target becomes a function which takes the new target and what the use would like to add to the reflog.
carlosmn
force-pushed
the
reference-update
branch
from
be60fe1
to
7041034
Compare
Following from the previous commits, make 'head' read-only and provide a method to update head while providing a message. The checkout() codepath which switches branches has been updated to provide a reflog entry which mimics git's.
carlosmn
changed the title
|
This should be ready for review. The move of |
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.
I realised that I never updated the references to the new method of updating. For now I've left
Reference.target=as a proxy for the method call, but eventually we might like to remove it completely. Not specifying a message for the reflog significantly reduces the usability of the tools, so we should not provide a way to update which does not expose the existence of the reflog update.We will also need to get rid of
Reference.log_append()as that is now done as part of the reference update (due to race conditions and correctness wrt locking) and you should never call it directly.