From 7f96c8ff4f106f92ef78b4ac9b770059b695cd29 Mon Sep 17 00:00:00 2001
From: Stefan Haller <stefan@haller-berlin.de>
Date: Mon, 22 Jun 2026 16:36:23 +0200
Subject: [PATCH] Remove bespoke commit selection restoration when starting a
 rebase

Starting an interactive rebase (the `edit` command and quick-start) used
to capture the selected commit range by hash before starting the rebase
and restore it afterwards, because new update-ref lines for stacked
branches can shift the commits' positions in the list. The generic
keep-selection-by-hash mechanism now does exactly this for every refresh,
including these, so the bespoke code is redundant.

This relies on the previous commit, which taught the generic matcher to
handle the case where the selected commit turns into a rebase TODO entry
while it's being edited - something the bespoke code handled implicitly
by matching on hash alone.
---
 .../controllers/local_commits_controller.go   | 42 +------------------
 1 file changed, 1 insertion(+), 41 deletions(-)

diff --git a/pkg/gui/controllers/local_commits_controller.go b/pkg/gui/controllers/local_commits_controller.go
index 083da4f4d..80f01fc03 100644
--- a/pkg/gui/controllers/local_commits_controller.go
+++ b/pkg/gui/controllers/local_commits_controller.go
@@ -8,7 +8,6 @@ import (
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
 	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/context"
-	"github.com/jesseduffield/lazygit/pkg/gui/context/traits"
 	"github.com/jesseduffield/lazygit/pkg/gui/controllers/helpers"
 	"github.com/jesseduffield/lazygit/pkg/gui/style"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
@@ -590,15 +589,9 @@ func (self *LocalCommitsController) edit(selectedCommits []*models.Commit, start
 
 	commits := self.c.Model().Commits
 	if !commits[endIdx].IsMerge() {
-		selectionRangeAndMode := self.getSelectionRangeAndMode()
 		err := self.c.Git().Rebase.InteractiveRebase(commits, startIdx, endIdx, todo.Edit, "")
 		return self.c.Helpers().MergeAndRebase.CheckMergeOrRebaseWithRefreshOptions(
-			err,
-			types.RefreshOptions{
-				Mode: types.BLOCK_UI, Then: func() {
-					self.restoreSelectionRangeAndMode(selectionRangeAndMode)
-				},
-			})
+			err, types.RefreshOptions{Mode: types.BLOCK_UI})
 	}
 
 	return self.startInteractiveRebaseWithEdit(selectedCommits)
@@ -618,7 +611,6 @@ func (self *LocalCommitsController) startInteractiveRebaseWithEdit(
 ) error {
 	return self.c.WithWaitingStatus(self.c.Tr.RebasingStatus, func(gocui.Task) error {
 		self.c.LogAction(self.c.Tr.Actions.EditCommit)
-		selectionRangeAndMode := self.getSelectionRangeAndMode()
 		err := self.c.Git().Rebase.EditRebase(commitsToEdit[len(commitsToEdit)-1].Hash())
 		return self.c.Helpers().MergeAndRebase.CheckMergeOrRebaseWithRefreshOptions(
 			err,
@@ -636,42 +628,10 @@ func (self *LocalCommitsController) startInteractiveRebaseWithEdit(
 						self.c.Log.Errorf("error when updating todos: %v", err)
 					}
 				}
-
-				self.restoreSelectionRangeAndMode(selectionRangeAndMode)
 			}})
 	})
 }
 
-type SelectionRangeAndMode struct {
-	selectedHash   string
-	rangeStartHash string
-	mode           traits.RangeSelectMode
-}
-
-func (self *LocalCommitsController) getSelectionRangeAndMode() SelectionRangeAndMode {
-	selectedIdx, rangeStartIdx, rangeSelectMode := self.context().GetSelectionRangeAndMode()
-	commits := self.c.Model().Commits
-	selectedHash := commits[selectedIdx].Hash()
-	rangeStartHash := commits[rangeStartIdx].Hash()
-	return SelectionRangeAndMode{selectedHash, rangeStartHash, rangeSelectMode}
-}
-
-func (self *LocalCommitsController) restoreSelectionRangeAndMode(selectionRangeAndMode SelectionRangeAndMode) {
-	// We need to select the same commit range again because after starting a rebase,
-	// new lines can be added for update-ref commands in the TODO file, due to
-	// stacked branches. So the selected commits may be in different positions in the list.
-	_, newSelectedIdx, ok1 := lo.FindIndexOf(self.c.Model().Commits, func(c *models.Commit) bool {
-		return c.Hash() == selectionRangeAndMode.selectedHash
-	})
-	_, newRangeStartIdx, ok2 := lo.FindIndexOf(self.c.Model().Commits, func(c *models.Commit) bool {
-		return c.Hash() == selectionRangeAndMode.rangeStartHash
-	})
-	if ok1 && ok2 {
-		self.context().SetSelectionRangeAndMode(newSelectedIdx, newRangeStartIdx, selectionRangeAndMode.mode)
-		self.context().HandleFocus(types.OnFocusOpts{})
-	}
-}
-
 func (self *LocalCommitsController) findCommitForQuickStartInteractiveRebase() (*models.Commit, error) {
 	commit, index, ok := lo.FindIndexOf(self.c.Model().Commits, func(c *models.Commit) bool {
 		return c.IsMerge() || c.Status == models.StatusMerged