Skip to content
This repository was archived by the owner on Dec 5, 2024. It is now read-only.

Commit 6f752a9

Browse files
committed
Fix Staged calculation
1 parent 12f4d61 commit 6f752a9

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

src/GitHub.Api/Git/GitStatusEntry.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,11 +134,14 @@ public static GitFileStatus ParseStatusMarker(char changeFlag)
134134
public GitFileStatus IndexStatus => indexStatus;
135135
public GitFileStatus WorkTreeStatus => workTreeStatus;
136136

137-
public bool Staged => indexStatus != GitFileStatus.None;
137+
public bool Staged => indexStatus != GitFileStatus.None && !Unmerged && !Untracked && !Ignored;
138138

139139
public bool Unmerged => (indexStatus == workTreeStatus && (indexStatus == GitFileStatus.Added || indexStatus == GitFileStatus.Deleted)) ||
140140
indexStatus == GitFileStatus.Unmerged || workTreeStatus == GitFileStatus.Unmerged;
141141

142+
public bool Untracked => workTreeStatus == GitFileStatus.Untracked;
143+
public bool Ignored => workTreeStatus == GitFileStatus.Ignored;
144+
142145
public override string ToString()
143146
{
144147
return $"Path:'{Path}' Status:'{Status}' FullPath:'{FullPath}' ProjectPath:'{ProjectPath}' OriginalPath:'{OriginalPath}' Staged:'{Staged}' Unmerged:'{Unmerged}' Status:'{IndexStatus}' Status:'{WorkTreeStatus}' ";

0 commit comments

Comments
 (0)