Skip to content

fix: stabilize patch-equivalent reconciliation #360

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

Merged
0xPlayerOne merged 1 commit into from
Aug 3, 2026
+6 −0
Merged

fix: stabilize patch-equivalent reconciliation #360

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
6 changes: 6 additions & 0 deletions src/lib/release-policy.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,12 @@ export function classifyReconciliation(input) {
if (Array.isArray(directChangedPaths)) {
const paths = [...new Set(directChangedPaths.map((path) => path.trim()).filter(Boolean))]
const unexpected = unexpectedReleasePaths(paths, allowed)
// Git may hide patch-equivalent commits when divergentCommits uses
// --cherry-pick. If the final trees are identical and no non-equivalent
// commits remain, classify the branches consistently as aligned.
if (!paths.length && !mainOnlyCommits.length && !stagingOnlyCommits.length) {
return { action: 'aligned', targetSha: mainSha, reason: 'Branches have different history but identical content.' }
}
const stagingOnlyReleaseOnly = stagingOnlyCommits.length > 0 && stagingOnlyCommits.every((commit) =>
Array.isArray(commit.changedPaths) && commit.changedPaths.length > 0 && unexpectedReleasePaths(commit.changedPaths, allowed).length === 0,
)
Expand Down