From a9051650461b40948a5fb3739be4b6ade3de1b5c Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Sun, 31 Jul 2022 16:11:39 +1000 Subject: [PATCH] remove double negatives --- pkg/commands/models/file.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/commands/models/file.go b/pkg/commands/models/file.go index 88e5a14e1..4589f91fa 100644 --- a/pkg/commands/models/file.go +++ b/pkg/commands/models/file.go @@ -120,17 +120,17 @@ func SetStatusFields(file *File, shortStatus string) { func deriveStatusFields(shortStatus string) StatusFields { stagedChange := shortStatus[0:1] unstagedChange := shortStatus[1:2] - untracked := lo.Contains([]string{"??", "A ", "AM"}, shortStatus) - hasNoStagedChanges := lo.Contains([]string{" ", "U", "?"}, stagedChange) + tracked := !lo.Contains([]string{"??", "A ", "AM"}, shortStatus) + hasStagedChanges := !lo.Contains([]string{" ", "U", "?"}, stagedChange) hasInlineMergeConflicts := lo.Contains([]string{"UU", "AA"}, shortStatus) hasMergeConflicts := hasInlineMergeConflicts || lo.Contains([]string{"DD", "AU", "UA", "UD", "DU"}, shortStatus) return StatusFields{ - HasStagedChanges: !hasNoStagedChanges, + HasStagedChanges: hasStagedChanges, HasUnstagedChanges: unstagedChange != " ", - Tracked: !untracked, + Tracked: tracked, Deleted: unstagedChange == "D" || stagedChange == "D", - Added: unstagedChange == "A" || untracked, + Added: unstagedChange == "A" || !tracked, HasMergeConflicts: hasMergeConflicts, HasInlineMergeConflicts: hasInlineMergeConflicts, ShortStatus: shortStatus,