diff options
Diffstat (limited to 'pkg/commands/git.go')
| -rw-r--r-- | pkg/commands/git.go | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/pkg/commands/git.go b/pkg/commands/git.go index 0e78f3f6b..43f78a28f 100644 --- a/pkg/commands/git.go +++ b/pkg/commands/git.go @@ -150,14 +150,15 @@ func (c *GitCommand) GetStatusFiles() []*File { _, hasNoStagedChanges := map[string]bool{" ": true, "U": true, "?": true}[stagedChange] file := &File{ - Name: filename, - DisplayString: statusString, - HasStagedChanges: !hasNoStagedChanges, - HasUnstagedChanges: unstagedChange != " ", - Tracked: !untracked, - Deleted: unstagedChange == "D" || stagedChange == "D", - HasMergeConflicts: change == "UU" || change == "AA" || change == "DU", - Type: c.OSCommand.FileType(filename), + Name: filename, + DisplayString: statusString, + HasStagedChanges: !hasNoStagedChanges, + HasUnstagedChanges: unstagedChange != " ", + Tracked: !untracked, + Deleted: unstagedChange == "D" || stagedChange == "D", + HasMergeConflicts: change == "UU" || change == "AA" || change == "DU", + HasInlineMergeConflicts: change == "UU" || change == "AA", + Type: c.OSCommand.FileType(filename), } files = append(files, file) } |