diff options
author | Jesse Duffield <jessedduffield@gmail.com> | 2018-08-07 12:49:31 +1000 |
---|---|---|
committer | Jesse Duffield <jessedduffield@gmail.com> | 2018-08-07 12:49:31 +1000 |
commit | 6985e529493b992d822b0523507c522bd84762e6 (patch) | |
tree | 7f4a616ff76598dd2e8cf457469e6b21aea9276a | |
parent | ba9485ae57a47b68e1e315fe56bd6d2755e18a4d (diff) |
handle error from git log that arises from lack of tracking
-rw-r--r-- | branches_panel.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/branches_panel.go b/branches_panel.go index 90cb66d8b..0b8508a3d 100644 --- a/branches_panel.go +++ b/branches_panel.go @@ -2,6 +2,7 @@ package main import ( "fmt" + "strings" "github.com/jesseduffield/gocui" ) @@ -90,7 +91,10 @@ func handleBranchSelect(g *gocui.Gui, v *gocui.View) error { } go func() { branch := getSelectedBranch(v) - diff, _ := getBranchGraph(branch.Name, branch.BaseBranch) + diff, err := getBranchGraph(branch.Name, branch.BaseBranch) + if err != nil && strings.HasPrefix(diff, "fatal: ambiguous argument") { + diff = "There is no tracking for this branch" + } renderString(g, "main", diff) }() return nil |