[v0.10.2] cherry-picks #2829
Merged
[v0.10.2] cherry-picks #2829
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
Before this, merge and diff refs were incorrectly not being marked as committed, which meant that when cache was reloaded they would be marked as mutable, which in turn lead to refs with them as an ancestor being removed by the cache manager's init method. Additionally, if the merge/diff ref was a parent, more inconsistent states could arise. Signed-off-by: Erik Sipsma <[email protected]> (cherry picked from commit 16699a4)
This fixes merge+diff refs from v0.10.{0,1} that weren't set as
committed.
Signed-off-by: Erik Sipsma <[email protected]>
(cherry picked from commit a493fab)
Before this, if a ref with multiple parents loaded some parents but then failed, the already loaded parents would not be released and thus leaked. Signed-off-by: Erik Sipsma <[email protected]> (cherry picked from commit 182d9df)
AkihiroSuda
approved these changes
Apr 27, 2022
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.
Picks: