mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-08-28 02:24:49 -05:00
Stefan HallerandClaude Opus 5
d2d5bdc2bc
`git worktree list` reports the main worktree as the common git dir with a trailing "/.git" removed, which equals the working tree only when the git dir sits inside it. In a submodule, a bare repo, or a repo using core.worktree it doesn't, so comparing the reported path against the working tree path matches nothing: no worktree is recognized as current or as main. Most visibly, inside a submodule lazygit claimed we were in a linked worktree named after the submodule, and offered to remove that "worktree". Comparing git dirs identifies a worktree unambiguously, so use that. A worktree whose directory is gone has no git dir to compare, and there we still have nothing better than its path. The submodule tests were asserting the linked-worktree suffix in the status view; it is gone now, and the repo name still says which submodule we're in. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
82 lines
2.2 KiB
Go
82 lines
2.2 KiB
Go
package submodule
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/config"
|
|
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
|
)
|
|
|
|
var Enter = NewIntegrationTest(NewIntegrationTestArgs{
|
|
Description: "Enter a submodule, add a commit, and then stage the change in the parent repo",
|
|
ExtraCmdArgs: []string{},
|
|
Skip: false,
|
|
SetupConfig: func(cfg *config.AppConfig) {
|
|
cfg.GetUserConfig().CustomCommands = []config.CustomCommand{
|
|
{
|
|
Key: config.Keybinding{"e"},
|
|
Context: "files",
|
|
Command: "git commit --allow-empty -m \"empty commit\"",
|
|
},
|
|
}
|
|
},
|
|
SetupRepo: func(shell *Shell) {
|
|
shell.EmptyCommit("first commit")
|
|
shell.CloneIntoSubmodule("my_submodule_name", "my_submodule_path")
|
|
shell.GitAddAll()
|
|
shell.Commit("add submodule")
|
|
},
|
|
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
|
assertInParentRepo := func() {
|
|
t.Views().Status().Content(Contains("repo"))
|
|
}
|
|
assertInSubmodule := func() {
|
|
t.Views().Status().Content(Contains("my_submodule_path"))
|
|
}
|
|
|
|
assertInParentRepo()
|
|
|
|
t.Views().Submodules().Focus().
|
|
Lines(
|
|
Contains("my_submodule_name").IsSelected(),
|
|
).
|
|
// enter the submodule
|
|
PressEnter()
|
|
|
|
assertInSubmodule()
|
|
|
|
t.Views().Files().IsFocused().
|
|
Press(config.Keybinding{"e"}).
|
|
Tap(func() {
|
|
t.Views().Commits().Content(Contains("empty commit"))
|
|
}).
|
|
// return to the parent repo
|
|
PressEscape()
|
|
|
|
assertInParentRepo()
|
|
|
|
t.Views().Submodules().IsFocused()
|
|
|
|
// we see the new commit in the submodule is ready to be staged in the parent repo
|
|
t.Views().Main().Content(Contains("> empty commit"))
|
|
|
|
t.Views().Files().Focus().
|
|
Lines(
|
|
MatchesRegexp(` M.*my_submodule_path \(submodule\)`).IsSelected(),
|
|
).
|
|
Tap(func() {
|
|
// main view also shows the new commit when we're looking at the submodule within the files view
|
|
t.Views().Main().Content(Contains("> empty commit"))
|
|
}).
|
|
PressPrimaryAction().
|
|
Press(keys.Files.CommitChanges).
|
|
Tap(func() {
|
|
t.ExpectPopup().CommitMessagePanel().Type("submodule change").Confirm()
|
|
}).
|
|
IsEmpty()
|
|
|
|
t.Views().Submodules().Focus()
|
|
|
|
// we no longer report a new commit because we've committed it in the parent repo
|
|
t.Views().Main().Content(DoesNotContain("> empty commit"))
|
|
},
|
|
})
|