8000 Merge pull request #547 from onecrayon/master · libgit2/objective-git@bc11b50 · GitHub
[go: up one dir, main page]
Skip to content

Commit bc11b50

Browse files
joshaberjoshaber
committed
Merge pull request #547 from onecrayon/master
Add offsets to bit flag comparisons for GTIndexEntryStatus
2 parents 1428a2d + 08b293e commit bc11b50

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)
0