Fix delete-merged-branch to avoid deleting master branch #1225
Open
Fix delete-merged-branch to avoid deleting master branch #1225
delete-merged-branch to avoid deleting master branch #1225Conversation
de18c2d to
f2729b6
Compare
bric3
commented
Jan 22, 2026
delete-merged-branchdelete-merged-branch to avoid deleting master branch
Collaborator
|
Thanks! Will review this in a few days - feel free to ping me if I forget! |
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.
This should fix #1132
git-delete-merged-branchalready checks if the branch is the default branch viagit_extra_default_branchhelper function, but the implementation only checkedinit.defaultBranch.This new implementation goes further by looking in this order:
git-extras.default-branchinit.defaultBranchmain,master,trunk,default,development,stable,release,prod,productionexist locallymainas last resortRemoved
defaultas a default branch as it was breaking this test, so I preferred to back out.git-extras/tests/test_git_archive_file.py
Lines 55 to 62 in 6f4cf0c