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

Clear cherry-picked commits after pasting

Browse Source 
It can be tedious after each cherry-pick opearation to clear the
selection by pressing escape in order for lazygit to stop displaying
info about copied commits. Also, it seems to be a rare case to
cherry-pick commits to more than one destination.

The simplest solution to address this issue is to clear the selection
upon paste.

The only exception is a merge conflict. Initially, I wanted to clear
selected commits in this scenario too. During a discussion we found out
that it may be convenient to have the copied commits still around.
Aborting the rebase and pasting the commits in the middle of a branch
can be a valid use case.
This commit is contained in:
molejnik88
2024-01-20 13:55:25 +00:00
committed by Jesse Duffield
parent 761c77f5a2
commit ee173ff7c9
5 changed files with 42 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go
View File

@ -54,6 +54,10 @@ var CherryPickConflicts = NewIntegrationTest(NewIntegrationTestArgs{
t.Common().AcknowledgeConflicts()
// cherry pick selection is not cleared when there are conflicts, so that the user
// is able to abort and try again without having to re-copy the commits
t.Views().Information().Content(Contains("2 commits copied"))
t.Views().Files().
IsFocused().
SelectedLine(Contains("file")).