Added message for branch deletion error due to worktrees (#660)

testing ss : 


AV sync
<img width="942" height="605" alt="image" src="https://github.com/user-attachments/assets/b5f0e594-2182-4881-8add-b612a2303b85" />

-------------
AV reorder:

![Uploading image.png…]()

Author: brain-crystal

internal/git/gitui/prune.go

@@ -3,12 +3,14 @@ package gitui
 import (
 	"context"
 	"fmt"
+	"os/exec"
 	"strings"
 
 	"emperror.dev/errors"
 	"github.com/aviator-co/av/internal/git"
 	"github.com/aviator-co/av/internal/meta"
 	"github.com/aviator-co/av/internal/utils/colors"
+	"github.com/aviator-co/av/internal/utils/errutils"
 	"github.com/aviator-co/av/internal/utils/uiutils"
 	"github.com/charmbracelet/bubbles/help"
 	"github.com/charmbracelet/bubbles/spinner"
@@ -215,24 +217,71 @@ func (vm *PruneBranchModel) runDelete() tea.Msg {
 		return err
 	}
 
+	// Always restore the checked out state, even if deletion fails.
+	// Use a variable to capture any deletion error and restore HEAD before returning.
+	var deletionErr error
+	var worktreeBranches []string
+
 	// Delete in the reverse order just in case. The targetBranches are sorted in the parent ->
 	// child order.
 	for i := len(vm.deleteCandidates) - 1; i >= 0; i-- {
 		branch := vm.deleteCandidates[i]
-		if _, err := vm.repo.Git(context.Background(), "branch", "-D", branch.branch.Short()); err != nil {
-			return errors.Errorf("cannot delete merged branch %q: %v", branch.branch.Short(), err)
+		if err := vm.repo.BranchDelete(context.Background(), branch.branch.Short()); err != nil {
+			// Check if the error is due to the branch being checked out in a worktree
+			if exiterr, ok := errutils.As[*exec.ExitError](err); ok &&
+				strings.Contains(string(exiterr.Stderr), "used by worktree") {
+				// Collect worktree branches but continue deleting others
+				worktreeBranches = append(worktreeBranches, branch.branch.Short())
+				continue
+			} else {
+				// Other errors are fatal
+				deletionErr = errors.Errorf("cannot delete merged branch %q: %v", branch.branch.Short(), err)
+				break
+			}
 		}
 		tx := vm.db.WriteTx()
 		tx.DeleteBranch(branch.branch.Short())
 		if err := tx.Commit(); err != nil {
-			return err
+			deletionErr = err
+			break
 		}
 	}
 
-	// Restore the checked out state.
+	// Restore the checked out state before returning any error.
 	if err := vm.CheckoutInitialState(); err != nil {
-		return err
+		// If we have both a deletion error and a checkout error, prioritize the checkout error
+		// as it's more critical (leaves user in a bad state).
+		if deletionErr != nil {
+			return errors.Errorf("failed to restore branch after deletion error: %v (original error: %v)", err, deletionErr)
+		}
+		return errors.Errorf("failed to restore branch: %v", err)
+	}
+
+	// Build worktree error message if any branches couldn't be deleted
+	var worktreeErr error
+	if len(worktreeBranches) > 0 {
+		var sb strings.Builder
+		sb.WriteString("Could not delete the following branches (checked out in worktrees):\n")
+		for _, br := range worktreeBranches {
+			fmt.Fprintf(&sb, "- %s\n", br)
+		}
+		sb.WriteString("Use 'git worktree list' to see all worktrees\n")
+		sb.WriteString("Remove worktrees with 'git worktree remove <path>' or checkout a different branch in those worktrees\n")
+		worktreeErr = errors.New(sb.String())
+	}
+
+	// Return both fatal deletion errors and worktree warnings
+	if deletionErr != nil {
+		if worktreeErr != nil {
+			return errors.Errorf("fatal error during branch deletion: %v\n\n%v", deletionErr, worktreeErr)
+		}
+		return deletionErr
 	}
+
+	if worktreeErr != nil {
+		return worktreeErr
+	}
+
 	return &PruneBranchProgress{deletionDone: true}
 }
 

internal/reorder/deletebranch.go

@@ -44,14 +44,24 @@ func (d DeleteBranchCmd) Execute(ctx *Context) error {
 		Args:      []string{"branch", "--delete", "--force", d.Name},
 		ExitError: true,
 	})
-	if exiterr, ok := errutils.As[*exec.ExitError](err); ok &&
-		strings.Contains(string(exiterr.Stderr), "not found") {
-		_, _ = fmt.Fprint(os.Stderr,
-			colors.Warning("Branch "), colors.UserInput(d.Name),
-			colors.Warning(" was already deleted.\n"),
-		)
-		return nil
-	} else if err != nil {
+	if exiterr, ok := errutils.As[*exec.ExitError](err); ok {
+		stderr := string(exiterr.Stderr)
+		if strings.Contains(stderr, "not found") {
+			_, _ = fmt.Fprint(os.Stderr,
+				colors.Warning("Branch "), colors.UserInput(d.Name),
+				colors.Warning(" was already deleted.\n"),
+			)
+			return nil
+		}
+		if strings.Contains(stderr, "used by worktree") {
+			msg := fmt.Sprintf("cannot delete branch %q: it is checked out in a worktree\n", d.Name)
+			msg += "Use 'git worktree list' to see all worktrees\n"
+			msg += "Remove the worktree with 'git worktree remove <path>' or checkout a different branch in that worktree\n"
+			_, _ = fmt.Fprint(os.Stderr, msg)
+			return nil
+		}
+	}
+	if err != nil {
 		return err
 	}