fix(pick): keep OID paired with commits#12353
Merged
Conversation
|
The latest updates on your projects. Learn more about Vercel for GitHub. 1 Skipped Deployment
|
github-actions
Bot
added
rust
Contributor
There was a problem hiding this comment.
Pull request overview
This PR fixes a critical bug in the select_commits_from_branch function where commit OIDs could become misaligned with their corresponding commits after filtering operations. The issue occurred because filter_map could skip commits when find_commit fails, causing index misalignment between the original commit_oids vector and the filtered commits vector.
Changes:
- Modified the
commitsvector to store tuples of(gix::ObjectId, git2::Commit)instead of just commits, ensuring OIDs remain paired with their commits throughout the filtering and selection process - Updated all references to extract the correct OID from the tuple structure
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.
No description provided.