Deduplicate commit parents to handle malformed merges #12120
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
Handle cases where commits contain duplicate parent IDs (produced by older GitButler code) by filtering parent_ids through a HashSet before constructing Commit values. This prevents mismatched parent lists that caused errors like "Parents for commit ... do not match" during operations such as commit_move_changes_between. The change applies deduplication in two places: when building a Commit fallback in walk.rs and when assembling parent_ids for newly created Commit values.
|
The latest updates on your projects. Learn more about Vercel for GitHub. 1 Skipped Deployment
|
Byron
requested changes
Feb 2, 2026
Collaborator
Byron
left a comment
Byron
left a comment
There was a problem hiding this comment.
In general, we can't change the order of the commits even if deduplicated.
I think a test should be very possible as well, and if Git doesn't want to do it, git hash-object will.
Lastly, while pondering over this a little, I came up with "it should be good to change this here as it should never be intended to have such duplicates.
Blocking merge while test is missing, and while I would hope that the deduplication might only have to happen in one of these spots.
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.
Handle cases where commits contain duplicate parent IDs (produced by
older GitButler code) by filtering parent_ids through a HashSet before
constructing Commit values. This prevents mismatched parent lists that
caused errors like "Parents for commit ... do not match" during
operations such as commit_move_changes_between. The change applies
deduplication in two places: when building a Commit fallback in walk.rs
and when assembling parent_ids for newly created Commit values.