mirrors/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-12 12:55:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

improve remove file logic

Browse source
This commit is contained in:
Jesse Duffield 2018-08-18 20:14:44 +10:00
parent 0174375562
commit 08666889f4
3 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
pkg/commands/git.go
View file

@ -81,7 +81,7 @@ func (c *GitCommand) GetStatusFiles() []File {
stagedChange := change[0:1]
unstagedChange := statusString[1:2]
filename := statusString[3:]
tracked := !includes([]string{"??", "A "}, change)
tracked := !includes([]string{"??", "A ", "AM"}, change)
file := File{
Name: filename,
DisplayString: statusString,
@ -358,11 +358,16 @@ func (c *GitCommand) IsInMergeState() (bool, error) {
// RemoveFile directly
func (c *GitCommand) RemoveFile(file File) error {
// if the file isn't tracked, we assume you want to delete it
if file.HasStagedChanges {
if err := c.OSCommand.RunCommand("git reset -- " + file.Name); err != nil {
return err
}
}
if !file.Tracked {
return os.RemoveAll(file.Name)
return os.RemoveAll(c.OSCommand.Unquote(file.Name))
}
// if the file is tracked, we assume you want to just check it out
return c.OSCommand.RunCommand("git checkout " + file.Name)
return c.OSCommand.RunCommand("git checkout -- " + file.Name)
}
// Checkout checks out a branch, with --force if you set the force arg to true