mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-09-10 07:36:27 -04:00
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> |
||
|---|---|---|
| .. | ||
| add.go | ||
| enter.go | ||
| enter_nested.go | ||
| remove.go | ||
| remove_nested.go | ||
| reset.go | ||
| reset_folder.go | ||
| resolve_conflict.go | ||
| resolve_conflict_rewound_side.go | ||
| shared.go | ||
| stage.go | ||
| stage_all_with_dirty_submodule.go | ||
| stage_dirty_only.go | ||