From 3415ed975b15671dbeb68194e08099091cc13b81 Mon Sep 17 00:00:00 2001
From: Stefan Haller <stefan@haller-berlin.de>
Date: Mon, 13 Oct 2025 15:00:09 +0200
Subject: [PATCH] Offer to force-delete a worktree if it contains submodules

---
 pkg/gui/controllers/helpers/worktree_helper.go       |  3 ++-
 pkg/i18n/english.go                                  |  2 +-
 .../tests/worktree/force_remove_worktree.go          |  2 +-
 .../force_remove_worktree_with_submodules.go         | 12 ------------
 .../tests/worktree/remove_worktree_from_branch.go    |  2 +-
 5 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/pkg/gui/controllers/helpers/worktree_helper.go b/pkg/gui/controllers/helpers/worktree_helper.go
index a54adcc49..ea889781e 100644
--- a/pkg/gui/controllers/helpers/worktree_helper.go
+++ b/pkg/gui/controllers/helpers/worktree_helper.go
@@ -189,7 +189,8 @@ func (self *WorktreeHelper) Remove(worktree *models.Worktree, force bool) error
 				self.c.LogAction(self.c.Tr.RemoveWorktree)
 				if err := self.c.Git().Worktree.Delete(worktree.Path, force); err != nil {
 					errMessage := err.Error()
-					if !strings.Contains(errMessage, "--force") {
+					if !strings.Contains(errMessage, "--force") &&
+						!strings.Contains(errMessage, "fatal: working trees containing submodules cannot be moved or removed") {
 						return err
 					}
 
diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go
index 86ba163aa..6c474c0b0 100644
--- a/pkg/i18n/english.go
+++ b/pkg/i18n/english.go
@@ -1933,7 +1933,7 @@ func EnglishTranslationSet() *TranslationSet {
 		RemoveWorktree:                           "Remove worktree",
 		RemoveWorktreeTitle:                      "Remove worktree",
 		RemoveWorktreePrompt:                     "Are you sure you want to remove worktree '{{.worktreeName}}'?",
-		ForceRemoveWorktreePrompt:                "'{{.worktreeName}}' contains modified or untracked files (to be honest, it could contain both). Are you sure you want to remove it?",
+		ForceRemoveWorktreePrompt:                "'{{.worktreeName}}' contains modified or untracked files, or submodules (or all of these). Are you sure you want to remove it?",
 		RemovingWorktree:                         "Deleting worktree",
 		DetachWorktree:                           "Detach worktree",
 		DetachingWorktree:                        "Detaching worktree",
diff --git a/pkg/integration/tests/worktree/force_remove_worktree.go b/pkg/integration/tests/worktree/force_remove_worktree.go
index 0d3bf90cf..e716b4e2e 100644
--- a/pkg/integration/tests/worktree/force_remove_worktree.go
+++ b/pkg/integration/tests/worktree/force_remove_worktree.go
@@ -36,7 +36,7 @@ var ForceRemoveWorktree = NewIntegrationTest(NewIntegrationTestArgs{
 
 				t.ExpectPopup().Confirmation().
 					Title(Equals("Remove worktree")).
-					Content(Equals("'linked-worktree' contains modified or untracked files (to be honest, it could contain both). Are you sure you want to remove it?")).
+					Content(Equals("'linked-worktree' contains modified or untracked files, or submodules (or all of these). Are you sure you want to remove it?")).
 					Confirm()
 			}).
 			Lines(
diff --git a/pkg/integration/tests/worktree/force_remove_worktree_with_submodules.go b/pkg/integration/tests/worktree/force_remove_worktree_with_submodules.go
index 02b8fced2..dd54eb97c 100644
--- a/pkg/integration/tests/worktree/force_remove_worktree_with_submodules.go
+++ b/pkg/integration/tests/worktree/force_remove_worktree_with_submodules.go
@@ -34,25 +34,13 @@ var ForceRemoveWorktreeWithSubmodules = NewIntegrationTest(NewIntegrationTestArg
 					Content(Equals("Are you sure you want to remove worktree 'linked-worktree'?")).
 					Confirm()
 
-				/* EXPECTED:
 				t.ExpectPopup().Confirmation().
 					Title(Equals("Remove worktree")).
 					Content(Equals("'linked-worktree' contains modified or untracked files, or submodules (or all of these). Are you sure you want to remove it?")).
 					Confirm()
-				ACTUAL: */
-				t.ExpectPopup().Alert().
-					Title(Equals("Error")).
-					Content(Equals("fatal: working trees containing submodules cannot be moved or removed")).
-					Confirm()
 			}).
-			/* EXPECTED:
 			Lines(
 				Contains("repo (main)").IsSelected(),
 			)
-			ACTUAL: */
-			Lines(
-				Contains("repo (main)"),
-				Contains("linked-worktree").IsSelected(),
-			)
 	},
 })
diff --git a/pkg/integration/tests/worktree/remove_worktree_from_branch.go b/pkg/integration/tests/worktree/remove_worktree_from_branch.go
index f0b8de4e6..b1e8cc1ce 100644
--- a/pkg/integration/tests/worktree/remove_worktree_from_branch.go
+++ b/pkg/integration/tests/worktree/remove_worktree_from_branch.go
@@ -48,7 +48,7 @@ var RemoveWorktreeFromBranch = NewIntegrationTest(NewIntegrationTestArgs{
 
 				t.ExpectPopup().Confirmation().
 					Title(Equals("Remove worktree")).
-					Content(Equals("'linked-worktree' contains modified or untracked files (to be honest, it could contain both). Are you sure you want to remove it?")).
+					Content(Equals("'linked-worktree' contains modified or untracked files, or submodules (or all of these). Are you sure you want to remove it?")).
 					Confirm()
 			}).
 			Lines(