go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-06-15 00:15:32 +02:00
Code Issues Releases Activity

Remove worktree version guards

Browse Source 
Our min required git version is 2.20 so there's no need to add guards
for worktrees because they were added in 2.5
This commit is contained in:
Jesse Duffield
2023-07-17 19:59:51 +10:00
parent fb4453c18a
commit cdfad864ae
4 changed files with 15 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/commands/git_commands/version.go
View File

@ -69,7 +69,3 @@ func (v *GitVersion) IsOlderThan(major, minor, patch int) bool {
func (v *GitVersion) IsOlderThanVersion(version *GitVersion) bool { func (v *GitVersion) IsOlderThanVersion(version *GitVersion) bool {
return v.IsOlderThan(version.Major, version.Minor, version.Patch) return v.IsOlderThan(version.Major, version.Minor, version.Patch)
} }
func (v *GitVersion) SupportsWorktrees() bool {
return !v.IsOlderThan(2, 5, 0)
}

22
pkg/gui/controllers.go
View File

@ -242,18 +242,16 @@ func (gui *Gui) resetHelpersAndControllers() {
controllers.AttachControllers(context, controllers.NewBasicCommitsController(common, context)) controllers.AttachControllers(context, controllers.NewBasicCommitsController(common, context))
} }
if gui.c.Git().Version.SupportsWorktrees() { for _, context := range []controllers.CanViewWorktreeOptions{
for _, context := range []controllers.CanViewWorktreeOptions{ gui.State.Contexts.LocalCommits,
gui.State.Contexts.LocalCommits, gui.State.Contexts.ReflogCommits,
gui.State.Contexts.ReflogCommits, gui.State.Contexts.SubCommits,
gui.State.Contexts.SubCommits, gui.State.Contexts.Stash,
gui.State.Contexts.Stash, gui.State.Contexts.Branches,
gui.State.Contexts.Branches, gui.State.Contexts.RemoteBranches,
gui.State.Contexts.RemoteBranches, gui.State.Contexts.Tags,
gui.State.Contexts.Tags, } {
} { controllers.AttachControllers(context, controllers.NewWorktreeOptionsController(common, context))
controllers.AttachControllers(context, controllers.NewWorktreeOptionsController(common, context))
}
} }
controllers.AttachControllers(gui.State.Contexts.ReflogCommits, controllers.AttachControllers(gui.State.Contexts.ReflogCommits,

10
pkg/gui/controllers/helpers/refresh_helper.go
View File

@ -598,11 +598,6 @@ func (self *RefreshHelper) refreshRemotes() error {
} }
func (self *RefreshHelper) refreshWorktrees() error { func (self *RefreshHelper) refreshWorktrees() error {
if !self.c.Git().Version.SupportsWorktrees() {
self.c.Model().Worktrees = []*models.Worktree{}
return nil
}
worktrees, err := self.c.Git().Loaders.Worktrees.GetWorktrees() worktrees, err := self.c.Git().Loaders.Worktrees.GetWorktrees()
if err != nil { if err != nil {
self.c.Log.Error(err) self.c.Log.Error(err)
@ -634,10 +629,7 @@ func (self *RefreshHelper) refreshStatus() {
} }
workingTreeState := self.c.Git().Status.WorkingTreeState() workingTreeState := self.c.Git().Status.WorkingTreeState()
var linkedWorktreeName string linkedWorktreeName := self.worktreeHelper.GetLinkedWorktreeName()
if self.c.Git().Version.SupportsWorktrees() {
linkedWorktreeName = self.worktreeHelper.GetLinkedWorktreeName()
}
repoName := git_commands.GetCurrentRepoName() repoName := git_commands.GetCurrentRepoName()

15
pkg/gui/gui.go
View File

@ -596,6 +596,10 @@ func (gui *Gui) viewTabMap() map[string][]context.TabView {
Tab: gui.c.Tr.FilesTitle, Tab: gui.c.Tr.FilesTitle,
ViewName: "files", ViewName: "files",
}, },
context.TabView{
Tab: gui.c.Tr.WorktreesTitle,
ViewName: "worktrees",
},
{ {
Tab: gui.c.Tr.SubmodulesTitle, Tab: gui.c.Tr.SubmodulesTitle,
ViewName: "submodules", ViewName: "submodules",
@ -603,17 +607,6 @@ func (gui *Gui) viewTabMap() map[string][]context.TabView {
}, },
} }
if gui.c.Git().Version.SupportsWorktrees() {
// insert between files and submodules tabs
result["files"] = append(result["files"][0:1],
context.TabView{
Tab: gui.c.Tr.WorktreesTitle,
ViewName: "worktrees",
},
result["files"][1],
)
}
return result return result
} }