Skip to content

fix: filter already-merged commits from PR range context #1521

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
zerone0x wants to merge 1 commit into from
+1 −1
Closed

fix: filter already-merged commits from PR range context #1521

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/server/src/git/Layers/GitCore.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1374,7 +1374,7 @@ export const makeGitCore = Effect.fn("makeGitCore")(function* (options?: {
runGitStdoutWithOptions(
"GitCore.readRangeContext.log",
cwd,
["log", "--oneline", range],
["log", "--oneline", "--cherry-pick", "--right-only", range],
Copy link
Copy Markdown
Contributor

@cursor cursor bot Mar 29, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

--cherry-pick --right-only requires triple-dot range notation

High Severity

The --cherry-pick and --right-only flags are silently ignored because the range variable uses double-dot notation (baseBranch..HEAD). These flags require triple-dot symmetric difference notation (baseBranch...HEAD) to work — Git needs to see commits from both sides simultaneously to identify patch-id equivalents. With double-dot, the intended filtering of already-merged commits simply doesn't happen. The git log command needs its own triple-dot range, separate from the git diff commands which correctly use double-dot.

Additional Locations (1)
Fix in Cursor Fix in Web

{
maxOutputBytes: RANGE_COMMIT_SUMMARY_MAX_OUTPUT_BYTES,
truncateOutputAtMaxBytes: true,
Expand Down
Loading