revert: remove locally-merged pruning, require forge-confirmed merge#171
Merged
Conversation
Reverts the local branch ancestry check introduced in #169. Pruning without --force now requires forge-confirmed PR merge status only. Also adds open-PR protection for stale detection, and refactors cd/checkout interactive flows into helper functions. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Codecov Report❌ Patch coverage is
📢 Thoughts on this report? Let us know! |
LocallyMerged was removed — git ancestry alone no longer grants force-free pruning. Update tests to reflect that a git-merged branch without a PR cache entry requires -f, and that all cache-absent branches appear in the error. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
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.
Reverts the local branch ancestry check introduced in #169. The locally-merged detection using
git branch --mergedhad a fundamental limitation: it doesn't work for squash-merges (the dominant workflow on GitHub). This caused false negatives where squash-merged branches wouldn't be auto-prunable, and false positives where local merges for other reasons (e.g. testing) could trigger unwanted pruning.Pruning without
--forcenow requires forge-confirmed PR merge status only. The--refresh-prhint is surfaced in the error message.Additional changes:
isStaleWorktreereturns false whenPRState == open)cd_cmd.gointeractive/recent/target paths intorunCdInteractive,runCdRecent,runCdTargethelperscheckout_cmd.gointeractive block intorunCheckoutInteractivehelperBreaking Changes
Test Coverage
isStaleWorktreewith PR states, 1TestIsWorktreePrunable)