go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-03 00:57:52 +02:00
Code Issues Releases Activity

Drop stash when successfully unstashing files after moving patch to index

Browse Source
This commit is contained in:
Stefan Haller
2025-07-01 14:25:50 +02:00
parent 823aa640b9
commit 32bd9e6029
2 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/commands/git_commands/patch.go
View File

@ -259,7 +259,7 @@ func (self *PatchCommands) MovePatchIntoIndex(commits []*models.Commit, commitId
} }
if stash { if stash {
if err := self.stash.Apply(0); err != nil { if err := self.stash.Pop(0); err != nil {
return err return err
} }
} }

5
pkg/integration/tests/patch_building/move_to_index_with_modified_file.go
View File

@ -54,11 +54,6 @@ var MoveToIndexWithModifiedFile = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().Secondary(). t.Views().Secondary().
Content(Contains("-1\n+11\n")) Content(Contains("-1\n+11\n"))
/* EXPECTED:
t.Views().Stash().IsEmpty() t.Views().Stash().IsEmpty()
ACTUAL: */
t.Views().Stash().Lines(
Contains("Auto-stashing changes"),
)
}, },
}) })