diff options
| author | Giorgio Previtera <gprevitera@equalexperts.com> | 2019-07-13 14:49:12 +0100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2019-07-27 11:05:23 +1000 |
| commit | 823b436b5388bd7321f14d22f7555dc974e61dad (patch) | |
| tree | e5ab686782459c26f2a0120a26de03db188eb403 /pkg/commands | |
| parent | 212327d746ecc956233e4f622d65d0568f6beea3 (diff) | |
477 Remove duplicate checkout
We already checout the file calling `c.DiscardUnstagedFileChanges`
Diffstat (limited to 'pkg/commands')
| -rw-r--r-- | pkg/commands/git.go | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/pkg/commands/git.go b/pkg/commands/git.go index 4e416310e..32382ba37 100644 --- a/pkg/commands/git.go +++ b/pkg/commands/git.go @@ -476,11 +476,6 @@ func (c *GitCommand) DiscardAllFileChanges(file *File) error { 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 { return c.removeFile(file.Name) |