Skip to content

Commit f3cd22e

Browse files
committed
Added offsets to git_index_entry->flags_extended comparisons, since the values are offset when provided as GTIndexEntry.flags
1 parent 233527d commit f3cd22e

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

ObjectiveGit/GTIndexEntry.m

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,15 +86,15 @@ - (BOOL)isStaged {
8686
}
8787

8888
- (GTIndexEntryStatus)status {
89-
if ((self.flags & GIT_IDXENTRY_UPDATE) != 0) {
89+
if ((self.flags & (GIT_IDXENTRY_UPDATE << 16)) != 0) {
9090
return GTIndexEntryStatusUpdated;
91-
} else if ((self.flags & GIT_IDXENTRY_UPTODATE) != 0) {
91+
} else if ((self.flags & (GIT_IDXENTRY_UPTODATE << 16)) != 0) {
9292
return GTIndexEntryStatusUpToDate;
93-
} else if ((self.flags & GIT_IDXENTRY_CONFLICTED) != 0) {
93+
} else if ((self.flags & (GIT_IDXENTRY_CONFLICTED << 16)) != 0) {
9494
return GTIndexEntryStatusConflicted;
95-
} else if ((self.flags & GIT_IDXENTRY_ADDED) != 0) {
95+
} else if ((self.flags & (GIT_IDXENTRY_ADDED << 16)) != 0) {
9696
return GTIndexEntryStatusAdded;
97-
} else if ((self.flags & GIT_IDXENTRY_REMOVE) != 0) {
97+
} else if ((self.flags & (GIT_IDXENTRY_REMOVE << 16)) != 0) {
9898
return GTIndexEntryStatusRemoved;
9999
}
100100

0 commit comments

Comments
 (0)