Fix: #328 Use BFS to collect all commits in walk_commits_to_base#333
Merged
acunniffe merged 3 commits intogit-ai-project:mainfrom Jan 18, 2026
Merged
Conversation
…ase-merges support The walk_commits_to_base function was only following parent(0), causing it to miss commits from merged branches when using git rebase --rebase-merges. This resulted in AI authorship being lost for side branch commits. Changed from linear traversal (parent(0) only) to BFS (Breadth-First Search) that traverses all parents, ensuring merge commits' second parents are not missed. Fixes git-ai-project#328
acunniffe
approved these changes
Jan 18, 2026
Collaborator
acunniffe
left a comment
acunniffe
left a comment
There was a problem hiding this comment.
Approved and adding a test! Thanks for the contribution
acunniffe
force-pushed
the
fix/bfs-walk-commits-rebase-merges
branch
from
1aac8dd to
9bf2d92
Compare
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
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.
The walk_commits_to_base function was only following parent(0), causing it to miss commits from merged branches when using git rebase --rebase-merges. This resulted in AI authorship being lost for side branch commits.
Changed from linear traversal (parent(0) only) to BFS (Breadth-First Search) that traverses all parents, ensuring merge commits' second parents are not missed.
Fixes #328