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

Fix incorrect stash diff after rename

Browse Source
This commit is contained in:
Brandon
2025-01-23 23:12:29 -08:00
committed by Stefan Haller
parent 5dff9af027
commit 02ca07a9be
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/gui/controllers/stash_controller.go
View File

@ -201,13 +201,13 @@ func (self *StashController) handleRenameStashEntry(stashEntry *models.StashEntr
HandleConfirm: func(response string) error { HandleConfirm: func(response string) error {
self.c.LogAction(self.c.Tr.Actions.RenameStash) self.c.LogAction(self.c.Tr.Actions.RenameStash)
err := self.c.Git().Stash.Rename(stashEntry.Index, response) err := self.c.Git().Stash.Rename(stashEntry.Index, response)
_ = self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.STASH}})
if err != nil { if err != nil {
_ = self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.STASH}})
return err return err
} }
self.context().SetSelection(0) // Select the renamed stash self.context().SetSelection(0) // Select the renamed stash
self.context().FocusLine() self.context().FocusLine()
return nil return self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.STASH}})
}, },
}) })

2
pkg/integration/tests/stash/rename.go
View File

@ -31,5 +31,7 @@ var Rename = NewIntegrationTest(NewIntegrationTestArgs{
t.ExpectPopup().Prompt().Title(Equals("Rename stash: stash@{1}")).Type(" baz").Confirm() t.ExpectPopup().Prompt().Title(Equals("Rename stash: stash@{1}")).Type(" baz").Confirm()
}). }).
SelectedLine(Contains("On master: foo baz")) SelectedLine(Contains("On master: foo baz"))
t.Views().Main().Content(Contains("file-1"))
}, },
}) })