[fix] Delete branches merged into selected base (#16) - #22
Merged
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #16
Summary
mainwhileHEADis elsewheretype:*label enforcement from the branch-name workflowactions/github-scriptto v8 for the Node 24 runnerRoot cause
The cleanup candidate list is computed with
git for-each-ref --merged <base>, butgit branch -dperforms its safety check against the currentHEADwhen no upstream is configured. A branch can therefore be safely merged into the selected base yet fail deletion from another branch. The fix uses force deletion only after the candidate has passed the selected-base merge check.Verification
pnpm verifynode --test --test-reporter=dot scripts/cleanup-merged.test.mjs(5 tests)git diff --checkScope
Repository tooling and pull request validation only; no client or server runtime behavior changes.