utils-code/jesseduffield.lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2026-09-10 07:36:27 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Extract helper method removeFiles

Browse source
This commit is contained in:
Stefan Haller 2026-03-22 22:29:09 +01:00
parent 46d8437bc2
commit b4dae453af
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
pkg/commands/git_commands/working_tree.go
View file

@ -238,10 +238,8 @@ func (self *WorkingTreeCommands) DiscardAllDirChanges(nodes []IFileNode) error {
return err
}
for _, path := range filesToRemove {
if err := self.os.RemoveFile(path); err != nil {
return err
}
if err := self.removeFiles(filesToRemove); err != nil {
return err
}
return runGitCmdOnPaths("checkout", filesToCheckout, self.cmd)
@ -268,13 +266,22 @@ func (self *WorkingTreeCommands) DiscardUnstagedDirChanges(nodes []IFileNode) er
})
}
for _, path := range filesToRemove {
if err := self.removeFiles(filesToRemove); err != nil {
return err
}
return runGitCmdOnPaths("checkout", filesToCheckout, self.cmd)
}
// Removes the given files from disk.
func (self *WorkingTreeCommands) removeFiles(paths []string) error {
for _, path := range paths {
if err := self.os.RemoveFile(path); err != nil {
return err
}
}
return runGitCmdOnPaths("checkout", filesToCheckout, self.cmd)
return nil
}
func (self *WorkingTreeCommands) RemoveUntrackedDirFiles(node IFileNode) error {