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

477 Remove unnecessary variable check

Browse Source 
hasInlineMergeConflicts is always true with hasMergeConflicts is true
This commit is contained in:
Giorgio Previtera
2019-07-14 11:29:36 +01:00
committed by Jesse Duffield
parent e83ef9858b
commit 827837b0b9
2 changed files with 1 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/commands/git.go
View File

@ -473,7 +473,7 @@ func (c *GitCommand) RebaseMode() (string, error) {
func (c *GitCommand) DiscardAllFileChanges(file *File) error {
// if the file isn't tracked, we assume you want to delete it
quotedFileName := c.OSCommand.Quote(file.Name)
if file.HasStagedChanges || file.HasMergeConflicts || file.HasInlineMergeConflicts {
if file.HasStagedChanges || file.HasMergeConflicts {
if err := c.OSCommand.RunCommand(fmt.Sprintf("git reset -- %s", quotedFileName)); err != nil {
return err
}