diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2019-11-17 14:08:56 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2019-11-21 22:07:14 +1100 |
| commit | 8347dcd67149e329d3c23c7453a59b12e2d5533d (patch) | |
| tree | f3fe41e32b171a2e6a00c1bdfc2392d854ba7cae /pkg/gui/branches_panel.go | |
| parent | dcb52857976762378b0e69bd45581231aa334482 (diff) | |
make upstream branch display more lenient on git errors
Diffstat (limited to 'pkg/gui/branches_panel.go')
| -rw-r--r-- | pkg/gui/branches_panel.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/gui/branches_panel.go b/pkg/gui/branches_panel.go index ca7ca23e8..c3fd37f26 100644 --- a/pkg/gui/branches_panel.go +++ b/pkg/gui/branches_panel.go @@ -56,7 +56,7 @@ func (gui *Gui) handleBranchSelect(g *gocui.Gui, v *gocui.View) error { }() go func() { upstream, _ := gui.GitCommand.GetUpstreamForBranch(branch.Name) - if strings.Contains(upstream, "no upstream configured for branch") { + if strings.Contains(upstream, "no upstream configured for branch") || strings.Contains(upstream, "unknown revision or path not in the working tree") { upstream = gui.Tr.SLocalize("notTrackingRemote") } graph, err := gui.GitCommand.GetBranchGraph(branch.Name) |