From d3696afd28c43b5fcb4622298363906c5cc4e5f9 Mon Sep 17 00:00:00 2001 From: Janne Koschinski Date: Wed, 23 Aug 2017 22:25:16 +0200 Subject: [PATCH] Improved git segment when in detached state or in newly initialized repo --- segment-git.go | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/segment-git.go b/segment-git.go index 2aed6cf5..2ef989d8 100644 --- a/segment-git.go +++ b/segment-git.go @@ -76,14 +76,21 @@ func parseGitBranchInfo(status []string) map[string]string { } func getGitDetachedBranch(p *powerline) string { - command := exec.Command("git", "describe", "--tags", "--always") + command := exec.Command("git", "rev-parse", "--short", "HEAD") command.Env = gitProcessEnv() out, err := command.Output() if err != nil { - return "Error" + command2 := exec.Command("git", "symbolic-ref", "--short", "HEAD") + command2.Env = gitProcessEnv() + out, err := command2.Output() + if err != nil { + return "Error" + } else { + return strings.SplitN(string(out), "\n", 2)[0] + } } else { detachedRef := strings.SplitN(string(out), "\n", 2) - return fmt.Sprintf("%s %s", p.symbolTemplates.RepoDetached, detachedRef) + return fmt.Sprintf("%s %s", p.symbolTemplates.RepoDetached, detachedRef[0]) } }