Add --proceed flag to git-delete-squashed-branches (tj#1134) (tj#1135)

Co-authored-by: Norbert Kiesel <[email protected]>

bin/git-delete-squashed-branches

@@ -2,6 +2,12 @@
 
 set -euo pipefail
 
+proceed=false
+if [[ $# -gt 0 && ("$1" == "--proceed" || "$1" == "-p") ]]; then
+    proceed=true
+    shift
+fi
+
 if [[ $# -eq 0 ]]; then
   targetBranch=$(git rev-parse --abbrev-ref HEAD)
 else
@@ -13,6 +19,10 @@ git for-each-ref refs/heads/ "--format=%(refname:short)" | while read -r branch;
     mergeBase=$(git merge-base "$targetBranch" "$branch")
 
     if [[ $(git cherry "$targetBranch" "$(git commit-tree "$(git rev-parse "$branch^{tree}")" -p "$mergeBase" -m _)") == "-"* ]]; then
-        git branch -D "$branch"
+        if [[ $proceed == true ]]; then
+            git branch -D "$branch" || true
+        else
+            git branch -D "$branch"
+        fi
     fi
 done

man/git-delete-squashed-branches.1

@@ -1,18 +1,24 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-DELETE\-SQUASHED\-BRANCHES" "1" "May 2021" "" "Git Extras"
+.TH "GIT\-DELETE\-SQUASHED\-BRANCHES" "1" "February 2024" "" "Git Extras"
 .
 .SH "NAME"
 \fBgit\-delete\-squashed\-branches\fR \- Delete branches that were squashed
 .
 .SH "SYNOPSIS"
-\fBgit\-delete\-squashed\-branches\fR [<branch\-name>]
+\fBgit\-delete\-squashed\-branches\fR [\-\-proceed, \-p] [<branch\-name>]
 .
 .SH "DESCRIPTION"
 Deletes all git branches that have been "squash\-merged" into \fBbranch\-name\fR\.
 .
 .SH "OPTIONS"
+\-\-proceed, \-p
+.
+.P
+Proceed with the next branch even if the current branch cannot be deleted (e\.g\. because it is checked out in a worktree)
+.
+.P
 <branch\-name>
 .
 .P

man/git-delete-squashed-branches.md

@@ -3,14 +3,18 @@ git-delete-squashed-branches(1) -- Delete branches that were squashed
 
 ## SYNOPSIS
 
-`git-delete-squashed-branches` [<branch-name>]
+`git-delete-squashed-branches` [--proceed, -p] [<branch-name>]
 
 ## DESCRIPTION
 
 Deletes all git branches that have been "squash-merged" into `branch-name`.
 
 ## OPTIONS
 
+  --proceed, -p
+
+  Proceed with the next branch even if the current branch cannot be deleted (e.g. because it is checked out in a worktree)
+
   <branch-name>
 
   The target branch were the "squashed-merged" branches were committed to. If no value is given, then the current checked out branch will be used.