go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-06-23 00:39:13 +02:00
Code Issues Releases Activity

Merge pull request #3 from jesseduffield/master

Browse Source 
Updated to latest master
This commit is contained in:
Mark Kopenga
2018-08-15 10:54:43 +02:00
committed by GitHub
parent 7e926cf41d db140842f3
commit 10c53162ca
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
v0.1.59 v0.1.61

7
pkg/git/branch_list_builder.go
View File

@ -39,7 +39,10 @@ func (b *BranchListBuilder) obtainCurrentBranch() commands.Branch {
// even though you're on 'master' // even though you're on 'master'
branchName, err := b.GitCommand.OSCommand.RunCommandWithOutput("git symbolic-ref --short HEAD") branchName, err := b.GitCommand.OSCommand.RunCommandWithOutput("git symbolic-ref --short HEAD")
if err != nil { 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: " *"} return commands.Branch{Name: strings.TrimSpace(branchName), Recency: " *"}
} }
@ -141,7 +144,7 @@ func branchInfoFromLine(line string) (string, string, string) {
r := regexp.MustCompile("\\|.*\\s") r := regexp.MustCompile("\\|.*\\s")
line = r.ReplaceAllString(line, " ") line = r.ReplaceAllString(line, " ")
words := strings.Split(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 { func abbreviatedTimeUnit(timeUnit string) string {