bump version to v0.1.60

more robust reading of reflog to get branch name
try rev-parse of git symbolic-ref returns nothing
2026-10-01 03:26:41 -04:00 · 2018-08-15 09:52:23 +10:00 · 2018-08-15 09:45:24 +10:00 · 2018-08-15 09:42:02 +10:00 · 2018-08-14 19:23:05 +10:00 · 2018-08-14 19:22:38 +10:00
3 changed files with 7 additions and 4 deletions
@@ -1 +1 @@
-v0.1.58
+v0.1.60
@@ -39,7 +39,10 @@ func (b *BranchListBuilder) obtainCurrentBranch() commands.Branch {
 	// even though you're on 'master'
 	branchName, err := b.GitCommand.OSCommand.RunCommandWithOutput("git symbolic-ref --short HEAD")
 	if err != nil {
-		panic(err.Error())
+		branchName, err = b.GitCommand.OSCommand.RunCommandWithOutput("git rev-parse --short HEAD")
+		if err != nil {
+			panic(err.Error())
+		}
 	}
 	return commands.Branch{Name: strings.TrimSpace(branchName), Recency: "  *"}
 }
@@ -141,7 +144,7 @@ func branchInfoFromLine(line string) (string, string, string) {
 	r := regexp.MustCompile("\\|.*\\s")
 	line = r.ReplaceAllString(line, " ")
 	words := strings.Split(line, " ")
-	return words[0], words[1], words[3]
+	return words[0], words[1], words[len(words)-1]
 }

 func abbreviatedTimeUnit(timeUnit string) string {
@@ -68,7 +68,7 @@ func NewGui(log *logrus.Logger, gitCommand *commands.GitCommand, oSCommand *comm
 		Conflicts:     make([]commands.Conflict, 0),
 		EditHistory:   stack.New(),
 		Platform:      *oSCommand.Platform,
-		Version:       "test version", // TODO: send version in
+		Version:       version,
 	}

 	return &Gui{
Author	SHA1	Message	Date
Jesse Duffield	7002ee5d9b	bump version to v0.1.60	2018-08-15 09:52:23 +10:00
Jesse Duffield	0687c07f50	more robust reading of reflog to get branch name	2018-08-15 09:45:24 +10:00
Jesse Duffield	922f4ed5a4	try rev-parse of git symbolic-ref returns nothing	2018-08-15 09:42:02 +10:00
Jesse Duffield	652237d48f	bump version to v0.1.59	2018-08-14 19:23:05 +10:00
Jesse Duffield	6a3f8eefa5	send version number through app	2018-08-14 19:22:38 +10:00