use reflogs from state to work out branch recencies

4 files changed, 11 insertions, 16 deletions

diff --git a/pkg/gui/branches_panel.go b/pkg/gui/branches_panel.go
index 6ca257ed4..fe947f50f 100644
--- a/pkg/gui/branches_panel.go
+++ b/pkg/gui/branches_panel.go
@@ -63,7 +63,7 @@ func (gui *Gui) refreshBranches(g *gocui.Gui) error {
 	}
 
 	g.Update(func(g *gocui.Gui) error {
-		builder, err := commands.NewBranchListBuilder(gui.Log, gui.GitCommand)
+		builder, err := commands.NewBranchListBuilder(gui.Log, gui.GitCommand, gui.State.ReflogCommits)
 		if err != nil {
 			return err
 		}
@@ -374,7 +374,7 @@ func (gui *Gui) handleFastForward(g *gocui.Gui, v *gocui.View) error {
 			if err := gui.GitCommand.FastForward(branch.Name, remoteName, remoteBranchName); err != nil {
 				_ = gui.createErrorPanel(gui.g, err.Error())
 			}
-			_ = gui.refreshBranches(gui.g)
+			_ = gui.refreshCommits(gui.g)
 		}
 
 		_ = gui.closeConfirmationPrompt(gui.g, true)
@@ -481,7 +481,7 @@ func (gui *Gui) handleRenameBranch(g *gocui.Gui, v *gocui.View) error {
 				return gui.createErrorPanel(gui.g, err.Error())
 			}
 
-			return gui.refreshBranches(gui.g)
+			return gui.refreshCommits(gui.g)
 		})
 	}
 
diff --git a/pkg/gui/commits_panel.go b/pkg/gui/commits_panel.go
index 25be221d7..f0c391755 100644
--- a/pkg/gui/commits_panel.go
+++ b/pkg/gui/commits_panel.go
@@ -79,12 +79,13 @@ func (gui *Gui) refreshCommits(g *gocui.Gui) error {
 			return err
 		}
 
-		// doing this async because it shouldn't hold anything up
-		go func() {
-			if err := gui.refreshReflogCommits(); err != nil {
-				_ = gui.createErrorPanel(gui.g, err.Error())
-			}
-		}()
+		if err := gui.refreshReflogCommits(); err != nil {
+			return gui.createErrorPanel(gui.g, err.Error())
+		}
+
+		if err := gui.refreshBranches(gui.g); err != nil {
+			return gui.createErrorPanel(gui.g, err.Error())
+		}
 
 		if g.CurrentView() == gui.getCommitFilesView() || (g.CurrentView() == gui.getMainView() || gui.State.MainContext == "patch-building") {
 			return gui.refreshCommitFilesView()
diff --git a/pkg/gui/reset_menu_panel.go b/pkg/gui/reset_menu_panel.go
index 05bdb5e9b..dab7ee9dd 100644
--- a/pkg/gui/reset_menu_panel.go
+++ b/pkg/gui/reset_menu_panel.go
@@ -27,9 +27,6 @@ func (gui *Gui) resetToRef(ref string, strength string, options commands.RunComm
 	if err := gui.refreshFiles(); err != nil {
 		return err
 	}
-	if err := gui.refreshBranches(gui.g); err != nil {
-		return err
-	}
 	if err := gui.resetOrigin(gui.getCommitsView()); err != nil {
 		return err
 	}
diff --git a/pkg/gui/view_helpers.go b/pkg/gui/view_helpers.go
index 4d9fbb36e..7a1285bbb 100644
--- a/pkg/gui/view_helpers.go
+++ b/pkg/gui/view_helpers.go
@@ -14,15 +14,12 @@ import (
 var cyclableViews = []string{"status", "files", "branches", "commits", "stash"}
 
 func (gui *Gui) refreshSidePanels(g *gocui.Gui) error {
-	if err := gui.refreshBranches(g); err != nil {
+	if err := gui.refreshCommits(g); err != nil {
 		return err
 	}
 	if err := gui.refreshFiles(); err != nil {
 		return err
 	}
-	if err := gui.refreshCommits(g); err != nil {
-		return err
-	}
 
 	return gui.refreshStashEntries(g)
 }