Improved git segment when in detached state or in newly initialized repo

justjanne · Aug 23, 2017 · d3696af · d3696af
1 parent a3bd745
commit d3696af
Showing 1 changed file with 10 additions and 3 deletions.
diff --git 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])
 	}
 }