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

Co-authored-by: Norbert Kiesel <nk@iname.com>

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.html

@@ -76,7 +76,7 @@
 
 <h2 id="SYNOPSIS">SYNOPSIS</h2>
 
-<p><code>git-delete-squashed-branches</code> [&lt;branch-name&gt;]</p>
+<p><code>git-delete-squashed-branches</code> [--proceed, -p] [&lt;branch-name&gt;]</p>
 
 <h2 id="DESCRIPTION">DESCRIPTION</h2>
 
@@ -84,6 +84,10 @@
 
 <h2 id="OPTIONS">OPTIONS</h2>
 
+<p>  --proceed, -p</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>
+
 <p>  &lt;branch-name&gt;</p>
 
 <p>  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.</p>
@@ -102,7 +106,7 @@
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Written by Teddy Katz &lt;<a href="&#109;&#97;&#x69;&#108;&#x74;&#x6f;&#58;&#116;&#x65;&#x64;&#x64;&#121;&#46;&#x6b;&#97;&#116;&#122;&#64;&#103;&#109;&#x61;&#105;&#108;&#46;&#99;&#x6f;&#x6d;" data-bare-link="true">&#x74;&#101;&#x64;&#100;&#x79;&#46;&#x6b;&#x61;&#x74;&#x7a;&#x40;&#x67;&#109;&#97;&#105;&#108;&#46;&#x63;&#111;&#109;</a>&gt; and Vladimir Jimenez &lt;<a href="&#x6d;&#97;&#x69;&#108;&#116;&#x6f;&#58;&#109;&#x65;&#x40;&#97;&#108;&#x6c;&#x65;&#x6a;&#111;&#x2e;&#105;&#x6f;" data-bare-link="true">&#109;&#x65;&#64;&#x61;&#x6c;&#108;&#x65;&#106;&#x6f;&#46;&#105;&#x6f;</a>&gt;</p>
+<p>Written by Teddy Katz &lt;<a href="&#109;&#97;&#105;&#108;&#x74;&#111;&#58;&#116;&#101;&#100;&#x64;&#x79;&#46;&#x6b;&#97;&#x74;&#122;&#64;&#103;&#109;&#97;&#x69;&#108;&#46;&#99;&#x6f;&#x6d;" data-bare-link="true">&#116;&#x65;&#x64;&#x64;&#x79;&#x2e;&#x6b;&#97;&#116;&#122;&#64;&#103;&#109;&#x61;&#105;&#x6c;&#x2e;&#x63;&#x6f;&#109;</a>&gt; and Vladimir Jimenez &lt;<a href="&#x6d;&#x61;&#105;&#x6c;&#x74;&#x6f;&#58;&#x6d;&#x65;&#x40;&#x61;&#x6c;&#108;&#101;&#106;&#111;&#46;&#105;&#111;" data-bare-link="true">&#109;&#101;&#64;&#x61;&#108;&#x6c;&#x65;&#106;&#111;&#46;&#x69;&#111;</a>&gt;</p>
 
 <h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
 
@@ -115,7 +119,7 @@
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>May 2021</li>
+    <li class='tc'>February 2024</li>
     <li class='tr'>git-delete-squashed-branches(1)</li>
   </ol>
 

man/git-delete-squashed-branches.md

@@ -3,7 +3,7 @@ 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
 
@@ -11,6 +11,10 @@ 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.