go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-31 23:19:40 +02:00
Code Issues Releases Activity

477 Remove duplicate checkout

Browse Source 
We already checout the file calling `c.DiscardUnstagedFileChanges`
This commit is contained in:
Giorgio Previtera 2019-07-13 14:49:12 +01:00 committed by Jesse Duffield
parent 212327d746
commit 823b436b53
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/commands/git.go
View File

@ -476,11 +476,6 @@ func (c *GitCommand) DiscardAllFileChanges(file *File) error {
return err return err
} }
} }
if file.HasMergeConflicts || file.HasInlineMergeConflicts {
if err := c.OSCommand.RunCommand(fmt.Sprintf("git checkout -- %s", quotedFileName)); err != nil {
return err
}
}
if !file.Tracked { if !file.Tracked {
return c.removeFile(file.Name) return c.removeFile(file.Name)