Files
lazygit/pkg/integration/tests/submodule/remove_in_linked_worktree.go
Stefan HallerandClaude Opus 5.5 98ca24de23 Delete the right git dir when removing a submodule in a linked worktree
Removing a submodule in a linked worktree deletes the git dir of that
submodule in the main worktree. This breaks the submodule there, and
any unpushed commits, local branches and stashes in it are lost. The
git dir of the submodule in the linked worktree stays behind.

Git keeps the git dirs of submodules separately for each worktree. For
a linked worktree, they are in .git/worktrees/<worktree>/modules.
Lazygit used the worktree's git dir until 3b723282cb switched it to the
repo's git dir, so this has been broken since v0.41.0. Use the
worktree's git dir again.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-07 23:46:56 +01:00

49 lines
1.6 KiB
Go

package submodule
import (
"github.com/jesseduffield/lazygit/pkg/config"
. "github.com/jesseduffield/lazygit/pkg/integration/components"
)
var RemoveInLinkedWorktree = NewIntegrationTest(NewIntegrationTestArgs{
Description: "Remove a submodule in a linked worktree",
ExtraCmdArgs: []string{},
Skip: false,
SetupConfig: func(config *config.AppConfig) {},
SetupRepo: func(shell *Shell) {
shell.EmptyCommit("first commit")
shell.CloneIntoSubmodule("my_submodule_name", "my_submodule_path")
shell.GitAddAll()
shell.Commit("add submodule")
shell.AddWorktree("HEAD", "../linked-worktree", "mybranch")
shell.Chdir("../linked-worktree")
shell.RunCommand([]string{"git", "submodule", "update", "--init"})
},
Run: func(t *TestDriver, keys config.KeybindingConfig) {
// Git keeps the git dirs of submodules separately for each worktree
mainGitDirSubmodulePath := "../repo/.git/modules/my_submodule_name"
linkedGitDirSubmodulePath := "../repo/.git/worktrees/linked-worktree/modules/my_submodule_name"
t.FileSystem().
PathPresent(mainGitDirSubmodulePath).
PathPresent(linkedGitDirSubmodulePath)
t.Views().Submodules().Focus().
Lines(
Contains("my_submodule_name").IsSelected(),
).
Press(keys.Universal.Remove).
Tap(func() {
t.ExpectPopup().Confirmation().
Title(Equals("Remove submodule")).
Content(Equals("Are you sure you want to remove submodule 'my_submodule_name' and its corresponding directory? This is irreversible.")).
Confirm()
}).
IsEmpty()
t.FileSystem().
PathPresent(mainGitDirSubmodulePath).
PathNotPresent(linkedGitDirSubmodulePath)
},
})