sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-28 16:02:01 +03:00
Code Activity

Add confirmation for hard reset when there are uncommitted changes

Browse Source
This commit is contained in:
Stefan Haller
2025-07-06 14:24:50 +02:00
parent f872912c07
commit 7153305174
4 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/gui/controllers/helpers/refs_helper.go
View File

@ -248,8 +248,15 @@ func (self *RefsHelper) CreateGitResetMenu(name string, ref string) error {
style.FgRed.Sprintf("reset --%s %s", row.strength, name),
},
OnPress: func() error {
self.c.LogAction("Reset")
return self.ResetToRef(ref, row.strength, []string{})
return self.c.ConfirmIf(row.strength == "hard" && IsWorkingTreeDirty(self.c.Model().Files),
types.ConfirmOpts{
Title: self.c.Tr.Actions.HardReset,
Prompt: self.c.Tr.ResetHardConfirmation,
HandleConfirm: func() error {
self.c.LogAction("Reset")
return self.ResetToRef(ref, row.strength, []string{})
},
})
},
Key: row.key,
Tooltip: row.tooltip,