Skip to content

fix(branch): pass HEAD to --merged when deleting merged branches #81

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
maxbolgarin merged 1 commit into from
Sep 30, 2026
Merged

fix(branch): pass HEAD to --merged when deleting merged branches #81

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion scripts/branch.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ function branch_script {
"$main_branch"|"$current_branch"|master|main|develop) continue ;;
esac
merged_to_delete+=("$_mb")
done < <(git branch --merged --format='%(refname:short)')
done < <(git branch --merged HEAD --format='%(refname:short)')

for branch_to_delete in "${merged_to_delete[@]}"; do
delete_output=$(git branch -d "$branch_to_delete" 2>&1)
Expand Down
18 changes: 18 additions & 0 deletions tests/test_branch_operations.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,24 @@ teardown() {
[ "$status" -ne 0 ]
}

@test "branch deletion: merged-branch listing used by gitb branch delete works" {
create_test_branch "feature/merged"
make_test_commit "feature.txt" "Feature work"
git checkout main
git merge feature/merged --no-edit

run git branch --merged HEAD --format='%(refname:short)'
[ "$status" -eq 0 ]
[[ "$output" == *"feature/merged"* ]]
}

@test "branch deletion: --merged is never followed directly by another flag" {
# `--merged`/`--no-merged` take an optional commit, so git parses a
# following `--format=...` as that commit: "malformed object name".
run grep -rnE -- '--(no-)?merged +-' "${GITBASHER_ROOT}/scripts"
[ "$status" -ne 0 ]
}

# ===== Remote branch tests =====

@test "remote branches: can fetch from remote" {
Expand Down
Loading