go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-04-23 12:18:51 +02:00
Code Issues Releases Activity

remove double negatives

Browse Source
This commit is contained in:
Jesse Duffield 2022-07-31 16:11:39 +10:00
parent 7077ea428f
commit a905165046
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/commands/models/file.go
View File

@ -120,17 +120,17 @@ func SetStatusFields(file *File, shortStatus string) {
func deriveStatusFields(shortStatus string) StatusFields { func deriveStatusFields(shortStatus string) StatusFields {
stagedChange := shortStatus[0:1] stagedChange := shortStatus[0:1]
unstagedChange := shortStatus[1:2] unstagedChange := shortStatus[1:2]
untracked := lo.Contains([]string{"??", "A ", "AM"}, shortStatus) tracked := !lo.Contains([]string{"??", "A ", "AM"}, shortStatus)
hasNoStagedChanges := lo.Contains([]string{" ", "U", "?"}, stagedChange) hasStagedChanges := !lo.Contains([]string{" ", "U", "?"}, stagedChange)
hasInlineMergeConflicts := lo.Contains([]string{"UU", "AA"}, shortStatus) hasInlineMergeConflicts := lo.Contains([]string{"UU", "AA"}, shortStatus)
hasMergeConflicts := hasInlineMergeConflicts || lo.Contains([]string{"DD", "AU", "UA", "UD", "DU"}, shortStatus) hasMergeConflicts := hasInlineMergeConflicts || lo.Contains([]string{"DD", "AU", "UA", "UD", "DU"}, shortStatus)
return StatusFields{ return StatusFields{
HasStagedChanges: !hasNoStagedChanges, HasStagedChanges: hasStagedChanges,
HasUnstagedChanges: unstagedChange != " ", HasUnstagedChanges: unstagedChange != " ",
Tracked: !untracked, Tracked: tracked,
Deleted: unstagedChange == "D" || stagedChange == "D", Deleted: unstagedChange == "D" || stagedChange == "D",
Added: unstagedChange == "A" || untracked, Added: unstagedChange == "A" || !tracked,
HasMergeConflicts: hasMergeConflicts, HasMergeConflicts: hasMergeConflicts,
HasInlineMergeConflicts: hasInlineMergeConflicts, HasInlineMergeConflicts: hasInlineMergeConflicts,
ShortStatus: shortStatus, ShortStatus: shortStatus,