1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-08-06 22:33:07 +02:00

Adjust selection after cherry-picking commits

Keep the same commit selected, by moving the selection down by the number of
cherry-picked commits. We also do this when reverting commits, and it is
possible now that we use a sync waiting status.

We also need to turn the refresh that happens as part of CheckMergeOrRebase into
a sync one, so that the commits list is up to date and the new selection isn't
clamped.
This commit is contained in:
Stefan Haller
2025-07-02 18:29:14 +02:00
parent 09a4e0b209
commit 0fc107c8c1
6 changed files with 29 additions and 17 deletions

View File

@ -70,9 +70,9 @@ var CherryPickRange = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().Information().Content(DoesNotContain("commits copied"))
}).
Lines(
Contains("four").IsSelected(),
Contains("four"),
Contains("three"),
Contains("two"),
Contains("two").IsSelected(),
Contains("one"),
Contains("base"),
)