From da89640523a321b8cc68e746eca6c0215200f29e Mon Sep 17 00:00:00 2001 From: Slava Karpenko Date: Fri, 2 Oct 2015 19:46:38 +0300 Subject: [PATCH] Adjusted GTMergeAnalysis type GTMergeAnalysis is actually NS_OPTIONS and not NS_ENUM. Swift is getting confused at the bitmasks when it's defined as NS_ENUM. --- ObjectiveGit/GTRepository+Pull.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ObjectiveGit/GTRepository+Pull.h b/ObjectiveGit/GTRepository+Pull.h index 463e52cdd..63cf39a9a 100644 --- a/ObjectiveGit/GTRepository+Pull.h +++ b/ObjectiveGit/GTRepository+Pull.h @@ -13,7 +13,7 @@ NS_ASSUME_NONNULL_BEGIN /// An enum describing the result of the merge analysis. /// See `git_merge_analysis_t`. -typedef NS_ENUM(NSInteger, GTMergeAnalysis) { +typedef NS_OPTIONS(NSInteger, GTMergeAnalysis) { GTMergeAnalysisNone = GIT_MERGE_ANALYSIS_NONE, GTMergeAnalysisNormal = GIT_MERGE_ANALYSIS_NORMAL, GTMergeAnalysisUpToDate = GIT_MERGE_ANALYSIS_UP_TO_DATE,