diff options
Diffstat (limited to 'pkg/commands')
| -rw-r--r-- | pkg/commands/git_commands/worktree_loader.go | 14 | ||||
| -rw-r--r-- | pkg/commands/models/worktree.go | 5 |
2 files changed, 7 insertions, 12 deletions
diff --git a/pkg/commands/git_commands/worktree_loader.go b/pkg/commands/git_commands/worktree_loader.go index 8dc7dcbe5..4b65caee1 100644 --- a/pkg/commands/git_commands/worktree_loader.go +++ b/pkg/commands/git_commands/worktree_loader.go @@ -1,6 +1,7 @@ package git_commands import ( + "path/filepath" "strings" "github.com/jesseduffield/lazygit/pkg/commands/models" @@ -46,18 +47,11 @@ func (self *WorktreeLoader) GetWorktrees() ([]*models.Worktree, error) { Id: len(worktrees), Path: path, } + } else if strings.HasPrefix(splitLine, "branch ") { + branch := strings.SplitN(splitLine, " ", 2)[1] + currentWorktree.Branch = filepath.Base(branch) } } - /* - worktree /Users/jbaranick/Source/lazygit - HEAD f6d6b5dec0432ffa953611700ab9b1ff0089f948 - branch refs/heads/worktree_support - - worktree /Users/jbaranick/Source/lazygit/.worktrees/worktree_tests - HEAD f6d6b5dec0432ffa953611700ab9b1ff0089f948 - branch refs/heads/worktree_tests - */ - return worktrees, nil } diff --git a/pkg/commands/models/worktree.go b/pkg/commands/models/worktree.go index c4e31a9d3..f02dc184c 100644 --- a/pkg/commands/models/worktree.go +++ b/pkg/commands/models/worktree.go @@ -11,8 +11,9 @@ import ( // Worktree : A git worktree type Worktree struct { - Id int - Path string + Id int + Path string + Branch string } func (w *Worktree) RefName() string { |