fix: only track commits from when branch diverges#126
Merged
Conversation
After a rebase or when the base ref (e.g. origin/main) has advanced, using a raw `base..HEAD` range for git log includes commits that belong to the parent branch rather than just the branch's own commits. Replace all three call sites that computed commit ranges with merge-base lookups to find the actual fork point: - get_commits_since_base() in git/worktree.rs (local branch timeline) - get_full_commit_log() in git/worktree.rs (local branch context) - get_branch_timeline() in lib.rs (remote branch timeline via ws_exec) - build_remote_branch_context() in session_commands.rs (remote context) This is consistent with how build_diff_spec already uses GitRef::MergeBaseOf for computing diffs. The remote branch paths fall back to the raw range if merge-base fails (e.g. shallow clone).
matt2e
changed the title
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
1 participant
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.