fix(branch): prevent git delete-merged-branches from deleting default branch (#1132)

bin/git-delete-merged-branches

@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
-branches=$(git branch --no-color --merged | grep -vE "^(\*|\+)" | grep -v "$(git_extra_default_branch)" | grep -v svn)
+default_branch=$(git_extra_default_branch)
+branches=$(git branch --no-color --merged | grep -vE "^(\*|\+)" | sed 's/^[ ]*//' | grep -Fvx -e "$default_branch" -e "main" -e "master" -e "trunk" -e "svn" || true)
 if [ -n "$branches" ]
 then
     echo "$branches" | xargs git branch -d

bin/git-show-merged-branches

@@ -1,3 +1,4 @@
 #!/usr/bin/env bash
 
-git branch --no-color --merged | grep -v "\*" | grep -v "$(git_extra_default_branch)" | tr -d ' '
+default_branch=$(git_extra_default_branch)
+git branch --no-color --merged | grep -vE "^(\*|\+)" | sed 's/^[ ]*//' | grep -Fvx -e "$default_branch" -e "main" -e "master" -e "trunk" -e "svn" || true

bin/git-show-unmerged-branches

@@ -1,3 +1,4 @@
 #!/usr/bin/env bash
 
-git branch --no-color --no-merged | grep -v "\*" | grep -v "$(git_extra_default_branch)" | tr -d ' '
+default_branch=$(git_extra_default_branch)
+git branch --no-color --no-merged | grep -vE "^(\*|\+)" | sed 's/^[ ]*//' | grep -Fvx -e "$default_branch" -e "main" -e "master" -e "trunk" -e "svn" || true

helper/git-extra-utility

@@ -13,6 +13,14 @@ git_extra_default_branch() {
         echo "$extras_default_branch"
     elif [ -n "$init_default_branch" ]; then
         echo "$init_default_branch"
+    elif git show-ref --verify --quiet refs/heads/main; then
+        echo "main"
+    elif git show-ref --verify --quiet refs/heads/master; then
+        echo "master"
+    elif git show-ref --verify --quiet refs/heads/trunk; then
+        echo "trunk"
+    elif git show-ref --verify --quiet refs/heads/svn; then
+        echo "svn"
     else
         echo "main"
     fi

tests/git-delete-merged-branches.bats

@@ -0,0 +1,103 @@
+# shellcheck shell=bash
+
+source "$BATS_TEST_DIRNAME/test_util.sh"
+
+setup_file() {
+	test_util.setup_file
+	test_util.install_command delete-merged-branches
+	test_util.install_command show-merged-branches
+	test_util.install_command show-unmerged-branches
+}
+
+setup() {
+	test_util.cd_test
+
+	test_util.git_init
+	git commit --allow-empty -m "Initial commit"
+	git branch feature-merged
+	git branch feature-unmerged
+	git checkout feature-unmerged
+	git commit --allow-empty -m "Unmerged commit"
+	git checkout main
+}
+
+@test "show-merged-branches lists merged branches but not default branch" {
+	run git show-merged-branches
+	assert_output "feature-merged"
+	assert_success
+}
+
+@test "show-unmerged-branches lists unmerged branches" {
+	run git show-unmerged-branches
+	assert_output "feature-unmerged"
+	assert_success
+}
+
+@test "delete-merged-branches deletes merged branches and preserves default and unmerged branches" {
+	run git delete-merged-branches
+	assert_success
+
+	run git branch --list
+	assert_line -p "main"
+	assert_line -p "feature-unmerged"
+	refute_line -p "feature-merged"
+}
+
+@test "delete-merged-branches when checked out on feature branch protects default branch" {
+	git branch other-merged
+	git checkout feature-unmerged
+	run git delete-merged-branches
+	assert_success
+
+	run git branch --list
+	assert_line -p "main"
+	assert_line -p "feature-unmerged"
+	refute_line -p "other-merged"
+}
+
+@test "delete-merged-branches handles branch names with special characters" {
+	git branch "feature/foo+bar"
+	run git show-merged-branches
+	assert_line -p "feature/foo+bar"
+	assert_success
+
+	run git delete-merged-branches
+	assert_success
+
+	run git branch --list
+	assert_line -p "main"
+	refute_line -p "feature/foo+bar"
+}
+
+@test "delete-merged-branches protects master when master is the default branch" {
+	git checkout -b master
+	git branch -D main
+	run git show-merged-branches
+	assert_output "feature-merged"
+	assert_success
+
+	run git delete-merged-branches
+	assert_success
+
+	run git branch --list
+	assert_line -p "master"
+	assert_line -p "feature-unmerged"
+	refute_line -p "feature-merged"
+}
+
+@test "show-merged-branches, show-unmerged-branches, and delete-merged-branches succeed when no branches match" {
+	git branch -D feature-merged
+	git branch -D feature-unmerged
+
+	run git show-merged-branches
+	assert_success
+	assert_output ""
+
+	run git show-unmerged-branches
+	assert_success
+	assert_output ""
+
+	run git delete-merged-branches
+	assert_success
+}
+