Merge pull request #547 from onecrayon/master

Add offsets to bit flag comparisons for GTIndexEntryStatus

Author: joshaber

ObjectiveGit/GTIndexEntry.m

@@ -86,15 +86,15 @@ - (BOOL)isStaged {
 }
 
 - (GTIndexEntryStatus)status {
-	if ((self.flags & GIT_IDXENTRY_UPDATE) != 0) {
+	if ((self.flags & (GIT_IDXENTRY_UPDATE << 16)) != 0) {
 		return GTIndexEntryStatusUpdated;
-	} else if ((self.flags & GIT_IDXENTRY_UPTODATE) != 0) {
+	} else if ((self.flags & (GIT_IDXENTRY_UPTODATE << 16)) != 0) {
 		return GTIndexEntryStatusUpToDate;
-	} else if ((self.flags & GIT_IDXENTRY_CONFLICTED) != 0) {
+	} else if ((self.flags & (GIT_IDXENTRY_CONFLICTED << 16)) != 0) {
 		return GTIndexEntryStatusConflicted;
-	} else if ((self.flags & GIT_IDXENTRY_ADDED) != 0) {
+	} else if ((self.flags & (GIT_IDXENTRY_ADDED << 16)) != 0) {
 		return GTIndexEntryStatusAdded;
-	} else if ((self.flags & GIT_IDXENTRY_REMOVE) != 0) {
+	} else if ((self.flags & (GIT_IDXENTRY_REMOVE << 16)) != 0) {
 		return GTIndexEntryStatusRemoved;
 	}