discard old reflog commits when in new context

2 files changed, 13 insertions, 5 deletions

diff --git a/pkg/commands/git.go b/pkg/commands/git.go
index 3b49a254e..5ec4bb70a 100644
--- a/pkg/commands/git.go
+++ b/pkg/commands/git.go
@@ -1118,10 +1118,11 @@ func (c *GitCommand) FetchRemote(remoteName string) error {
 
 // GetNewReflogCommits only returns the new reflog commits since the given lastReflogCommit
 // if none is passed (i.e. it's value is nil) then we get all the reflog commits
-func (c *GitCommand) GetNewReflogCommits(lastReflogCommit *Commit) ([]*Commit, error) {
+func (c *GitCommand) GetNewReflogCommits(lastReflogCommit *Commit) ([]*Commit, bool, error) {
 	commits := make([]*Commit, 0)
 	re := regexp.MustCompile(`(\w+).*HEAD@\{([^\}]+)\}: (.*)`)
 	cmd := c.OSCommand.ExecutableFromString("git reflog --abbrev=20 --date=unix")
+	foundLastReflogCommit := false
 	err := RunLineOutputCmd(cmd, func(line string) (bool, error) {
 		match := re.FindStringSubmatch(line)
 		if len(match) <= 1 {
@@ -1138,6 +1139,7 @@ func (c *GitCommand) GetNewReflogCommits(lastReflogCommit *Commit) ([]*Commit, e
 		}
 
 		if lastReflogCommit != nil && commit.Sha == lastReflogCommit.Sha && commit.UnixTimestamp == lastReflogCommit.UnixTimestamp {
+			foundLastReflogCommit = true
 			// after this point we already have these reflogs loaded so we'll simply return the new ones
 			return true, nil
 		}
@@ -1146,10 +1148,10 @@ func (c *GitCommand) GetNewReflogCommits(lastReflogCommit *Commit) ([]*Commit, e
 		return false, nil
 	})
 	if err != nil {
-		return nil, err
+		return nil, false, err
 	}
 
-	return commits, nil
+	return commits, foundLastReflogCommit, nil
 }
 
 func (c *GitCommand) ConfiguredPager() string {
diff --git a/pkg/gui/reflog_panel.go b/pkg/gui/reflog_panel.go
index 199d9337f..d40467b28 100644
--- a/pkg/gui/reflog_panel.go
+++ b/pkg/gui/reflog_panel.go
@@ -52,12 +52,18 @@ func (gui *Gui) refreshReflogCommits() error {
 		lastReflogCommit = gui.State.ReflogCommits[0]
 	}
 
-	commits, err := gui.GitCommand.GetNewReflogCommits(lastReflogCommit)
+	commits, foundLastReflogCommit, err := gui.GitCommand.GetNewReflogCommits(lastReflogCommit)
 	if err != nil {
 		return gui.createErrorPanel(gui.g, err.Error())
 	}
 
-	gui.State.ReflogCommits = append(commits, gui.State.ReflogCommits...)
+	if foundLastReflogCommit {
+		gui.State.ReflogCommits = append(commits, gui.State.ReflogCommits...)
+	} else {
+		// if we haven't found it we're probably in a new repo so we don't want to
+		// retain the old reflog commits
+		gui.State.ReflogCommits = commits
+	}
 
 	if gui.getCommitsView().Context == "reflog-commits" {
 		return gui.renderReflogCommitsWithSelection()