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

Display short SHA when in detached HEAD state

Browse Source
This commit is contained in:
Luka Markušić
2022-07-31 08:44:42 +02:00
parent 767ef31661
commit 37bdbd9a21
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/gui/recent_repos_panel.go
View File

@ -14,6 +14,7 @@ import (
"github.com/jesseduffield/lazygit/pkg/gui/presentation/icons" "github.com/jesseduffield/lazygit/pkg/gui/presentation/icons"
"github.com/jesseduffield/lazygit/pkg/gui/style" "github.com/jesseduffield/lazygit/pkg/gui/style"
"github.com/jesseduffield/lazygit/pkg/gui/types" "github.com/jesseduffield/lazygit/pkg/gui/types"
"github.com/jesseduffield/lazygit/pkg/utils"
) )
func (gui *Gui) getCurrentBranch(path string) string { func (gui *Gui) getCurrentBranch(path string) string {
@ -21,8 +22,16 @@ func (gui *Gui) getCurrentBranch(path string) string {
headFile, err := ioutil.ReadFile(filepath.Join(path, "HEAD")) headFile, err := ioutil.ReadFile(filepath.Join(path, "HEAD"))
if err == nil { if err == nil {
content := strings.TrimSpace(string(headFile)) content := strings.TrimSpace(string(headFile))
branch := strings.TrimPrefix(content, "ref: refs/heads/") refsPrefix := "ref: refs/heads/"
return branch, nil branchDisplay := ""
if strings.HasPrefix(content, refsPrefix) {
// is a branch
branchDisplay = strings.TrimPrefix(content, refsPrefix)
} else {
// detached HEAD state, displaying short SHA
branchDisplay = utils.ShortSha(content)
}
return branchDisplay, nil
} }
return "", err return "", err
} }
@ -47,7 +56,7 @@ func (gui *Gui) getCurrentBranch(path string) string {
} }
} }
return "HEAD" return "unknown branch"
} }
func (gui *Gui) handleCreateRecentReposMenu() error { func (gui *Gui) handleCreateRecentReposMenu() error {