From aa42b16cc3e35a95f9d9e3d54b6bdfbb82535a1e Mon Sep 17 00:00:00 2001
From: joshaber <joshaber@gmail.com>
Date: Mon, 6 Jul 2015 14:12:47 -0400
Subject: [PATCH] Moved NS_ASSUME_NONNULL_BEGIN to before the definition of our
 extern'd strings.

---
 ObjectiveGit/GTDiff.h                        | 4 ++--
 ObjectiveGit/GTFilter.h                      | 4 ++--
 ObjectiveGit/GTRemote.h                      | 4 ++--
 ObjectiveGit/GTRepository+RemoteOperations.h | 4 ++--
 ObjectiveGit/GTRepository+Status.h           | 4 ++--
 ObjectiveGit/GTRepository.h                  | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/ObjectiveGit/GTDiff.h b/ObjectiveGit/GTDiff.h
index e2ba2cef9..68a510f4e 100644
--- a/ObjectiveGit/GTDiff.h
+++ b/ObjectiveGit/GTDiff.h
@@ -14,6 +14,8 @@
 @class GTRepository;
 @class GTTree;
 
+NS_ASSUME_NONNULL_BEGIN
+
 /// An `NSNumber` wrapped `GTDiffOptionsFlags` representing any flags you wish to
 /// pass into the initialisation.
 extern NSString *const GTDiffOptionsFlagsKey;
@@ -172,8 +174,6 @@ typedef NS_OPTIONS(NSInteger, GTDiffFindOptionsFlags) {
 	GTDiffFindOptionsFlagsBreakRewritesForRenamesOnly = GIT_DIFF_BREAK_REWRITES_FOR_RENAMES_ONLY,
 };
 
-NS_ASSUME_NONNULL_BEGIN
-
 /// A class representing a single "diff".
 ///
 /// Analagous to `git_diff_list` in libgit2, this object represents a list of
diff --git a/ObjectiveGit/GTFilter.h b/ObjectiveGit/GTFilter.h
index 2823300f1..33fea06f0 100644
--- a/ObjectiveGit/GTFilter.h
+++ b/ObjectiveGit/GTFilter.h
@@ -11,14 +11,14 @@
 @class GTRepository;
 @class GTFilterSource;
 
+NS_ASSUME_NONNULL_BEGIN
+
 /// The error domain for errors originating from GTFilter.
 extern NSString * const GTFilterErrorDomain;
 
 /// A filter with that name has already been registered.
 extern const NSInteger GTFilterErrorNameAlreadyRegistered;
 
-NS_ASSUME_NONNULL_BEGIN
-
 /// Git filter abstraction.
 ///
 /// **Note**: GTFilter is *not* thread safe. Registration and unregistration
diff --git a/ObjectiveGit/GTRemote.h b/ObjectiveGit/GTRemote.h
index 74f6af24c..a80ed3eb2 100644
--- a/ObjectiveGit/GTRemote.h
+++ b/ObjectiveGit/GTRemote.h
@@ -14,6 +14,8 @@
 @class GTReference;
 @class GTCredentialProvider;
 
+NS_ASSUME_NONNULL_BEGIN
+
 extern NSString * const GTRemoteRenameProblematicRefSpecs;
 
 // Auto Tag settings. See `git_remote_autotag_option_t`.
@@ -23,8 +25,6 @@ typedef enum {
 	GTRemoteDownloadTagsAll = GIT_REMOTE_DOWNLOAD_TAGS_ALL,
 } GTRemoteAutoTagOption;
 
-NS_ASSUME_NONNULL_BEGIN
-
 /// A class representing a remote for a git repository.
 ///
 /// Analogous to `git_remote` in libgit2.
diff --git a/ObjectiveGit/GTRepository+RemoteOperations.h b/ObjectiveGit/GTRepository+RemoteOperations.h
index d39a65aee..33f22b13c 100644
--- a/ObjectiveGit/GTRepository+RemoteOperations.h
+++ b/ObjectiveGit/GTRepository+RemoteOperations.h
@@ -10,11 +10,11 @@
 
 @class GTFetchHeadEntry;
 
+NS_ASSUME_NONNULL_BEGIN
+
 /// A `GTCredentialProvider`, that will be used to authenticate against the remote.
 extern NSString *const GTRepositoryRemoteOptionsCredentialProvider;
 
-NS_ASSUME_NONNULL_BEGIN
-
 @interface GTRepository (RemoteOperations)
 
 #pragma mark - Fetch
diff --git a/ObjectiveGit/GTRepository+Status.h b/ObjectiveGit/GTRepository+Status.h
index 6190dd025..d21e34fe7 100644
--- a/ObjectiveGit/GTRepository+Status.h
+++ b/ObjectiveGit/GTRepository+Status.h
@@ -12,6 +12,8 @@
 
 @class GTStatusDelta;
 
+NS_ASSUME_NONNULL_BEGIN
+
 /// An enum representing the status of a file
 /// See git_status_t
 typedef NS_OPTIONS(NSInteger, GTFileStatusFlags) {
@@ -81,8 +83,6 @@ typedef enum {
 /// Defaults to including all files.
 extern NSString *const GTRepositoryStatusOptionsPathSpecArrayKey;
 
-NS_ASSUME_NONNULL_BEGIN
-
 @interface GTRepository (Status)
 
 /// `YES` if the working directory has no modified, new, or deleted files.
diff --git a/ObjectiveGit/GTRepository.h b/ObjectiveGit/GTRepository.h
index dfbecbbea..231e22a67 100644
--- a/ObjectiveGit/GTRepository.h
+++ b/ObjectiveGit/GTRepository.h
@@ -52,6 +52,8 @@
 @class GTTree;
 @class GTRemote;
 
+NS_ASSUME_NONNULL_BEGIN
+
 /// Checkout strategies used by the various -checkout... methods
 /// See git_checkout_strategy_t
 typedef NS_OPTIONS(NSInteger, GTCheckoutStrategyType) {
@@ -148,8 +150,6 @@ extern NSString * const GTRepositoryInitOptionsInitialHEAD;
 /// initialization.
 extern NSString * const GTRepositoryInitOptionsOriginURLString;
 
-NS_ASSUME_NONNULL_BEGIN
-
 @interface GTRepository : NSObject
 
 /// The file URL for the repository's working directory.