use merge_base_octopus()
#5490
Merged
use merge_base_octopus()
#5490
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
|
@Byron is attempting to deploy a commit to the GitButler Team on Vercel. A member of the Team first needs to authorize it. |
8 tasks
Just like Git in merge-ORT, a virtual merge base helps to deal with multiple merge bases which can happen more easily when more than two commits are involved.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
This PR is the result of a learning experience that ultimately led me here.
As a result,
gitoxidenow providesRepository::merge_base_octopus()which will be a little bit faster on its own, but can be substantially faster when used with a re-usedgraphdata structure.Even though this PR doesn't do
graphre-use yet, the moregitoxideis used, the more likely it is that this becomes possible.Tasks
gitoxideto access the latest featuresmerge_base_octopussy()l()is used, and ideally that will also have agitoxidevariant so the whole function can be converted as a whole.Notes for the Reviewer
merge-ORThere, but if octopus is used for all merge-bases, it turns out to have no relevance.Part of me still thinks that maybe there is a way to leverage it, but it's good for nothing if the normal merge-base computation is order-dependent.