summaryrefslogtreecommitdiffstats
path: root/pkg/git
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2018-11-14 19:08:42 +1100
committerJesse Duffield <jessedduffield@gmail.com>2018-11-14 19:08:42 +1100
commita5f483fae97fa16b9291761e74acdc35a669df76 (patch)
treebe21b9607051a5ce5bcbd95670c77f8a41b1a73f /pkg/git
parent775d910bdc0fb01a24d0a9b8b3e985a80d8e560e (diff)
refactor obtaining current branch name
Diffstat (limited to 'pkg/git')
-rw-r--r--pkg/git/branch_list_builder.go10
1 files changed, 3 insertions, 7 deletions
diff --git a/pkg/git/branch_list_builder.go b/pkg/git/branch_list_builder.go
index 151e5b0b4..821f7b9b1 100644
--- a/pkg/git/branch_list_builder.go
+++ b/pkg/git/branch_list_builder.go
@@ -35,15 +35,11 @@ func NewBranchListBuilder(log *logrus.Entry, gitCommand *commands.GitCommand) (*
}
func (b *BranchListBuilder) obtainCurrentBranch() *commands.Branch {
- // I used go-git for this, but that breaks if you've just done a git init,
- // even though you're on 'master'
- branchName, err := b.GitCommand.OSCommand.RunCommandWithOutput("git symbolic-ref --short HEAD")
+ branchName, err := b.GitCommand.CurrentBranchName()
if err != nil {
- branchName, err = b.GitCommand.OSCommand.RunCommandWithOutput("git rev-parse --short HEAD")
- if err != nil {
- panic(err.Error())
- }
+ panic(err.Error())
}
+
return &commands.Branch{Name: strings.TrimSpace(branchName), Recency: " *"}
}