Repository navigation
feat(devtools): prune merged local branches after a pull - #59
Merged
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.
What
Adds a shared
post-mergejob tolefthook/org.yml. After agit pullon the default branch it deletes local branches whose pull request has merged.A branch is deleted only when all of these hold:
ghreports a merged PR whose head is exactly the local tipAnything else is kept and named, so commits made after the merge, or a PR closed unmerged, are never lost. Without
gh, a squash-merged branch is kept rather than guessed at. The script always exits 0, and--dry-runshows what it would do.Files
.devtools/prune-merged-branches.sh: the logic.lefthook/post-merge/prune-branches.sh: wrapper lefthook finds, like the pre-push oneslefthook/org.yml: thepost-mergejob.devtools/test-hooks.sh: cases for ancestry merge,gh-confirmed squash, squash with a moved head, closed unmerged, live remote, worktree, non-default branch, dry runREADME.md: short sectionTesting
bash .devtools/test-hooks.sh: passes, withghstubbedlefthook/org.ymlthroughremotespinned to a tag, then a realgit pullafter a merge. The ancestry-merged branch was deleted; the squash-merged (no PR forghto confirm), closed and live branches were keptgh pr listpath is covered only by the stubNotes
lefthook.ymlbumpsrefand runslefthook install. Repos still on pre-commit need the lefthook migration first.ref: <branch>withrefetch: true(the tip in AGENTS.md) made hooks report "script does not exist" when git ran them; a pinned tag withoutrefetchworked. Cause not confirmed, left unchanged here.