Merge branch 'master' into ben/libgit2-build

Author: phatblat

.gitmodules

@@ -7,16 +7,12 @@
 [submodule "libssh2"]
 	path = External/libssh2
 	url = https://github.com/libssh2/libssh2.git
-[submodule "Carthage.checkout/Nimble"]
+[submodule "Carthage/Checkouts/Nimble"]
 	path = Carthage/Checkouts/Nimble
 	url = https://github.com/Quick/Nimble.git
-[submodule "Carthage.checkout/Quick"]
+[submodule "Carthage/Checkouts/Quick"]
 	path = Carthage/Checkouts/Quick
 	url = https://github.com/Quick/Quick.git
-[submodule "Carthage.checkout/xcconfigs"]
+[submodule "Carthage/Checkouts/xcconfigs"]
 	path = Carthage/Checkouts/xcconfigs
 	url = https://github.com/jspahrsummers/xcconfigs.git
-[submodule "Carthage/Checkouts/Nimble"]
-	url = https://github.com/Quick/Nimble.git
-[submodule "Carthage/Checkouts/Quick"]
-	url = https://github.com/Quick/Quick.git

External/libgit2

@@ -17,6 +17,8 @@ NS_ASSUME_NONNULL_BEGIN
 /// A `GTBlame` provides authorship info, through `GTBlameHunk` for each line of a file. Analogous to `git_blame` in libgit2.
 @interface GTBlame : NSObject
 
+- (instancetype)init NS_UNAVAILABLE;
+
 /// Designated initializer.
 ///
 /// blame - A git_blame to wrap. May not be NULL.

ObjectiveGit/GTBlame.h

@@ -21,6 +21,11 @@ @interface GTBlame ()
 
 @implementation GTBlame
 
+- (instancetype)init {
+	NSAssert(NO, @"Call to an unavailable initializer.");
+	return nil;
+}
+
 - (instancetype)initWithGitBlame:(git_blame *)blame {
 	NSParameterAssert(blame != NULL);
 

ObjectiveGit/GTBlame.m

@@ -17,6 +17,8 @@ NS_ASSUME_NONNULL_BEGIN
 /// A `GTBlameHunk` is an object that provides authorship info for a set of lines in a `GTBlame`.
 @interface GTBlameHunk : NSObject
 
+- (instancetype)init NS_UNAVAILABLE;
+
 /// Designated initializer.
 ///
 /// hunk - A git_blame_hunk to wrap. May not be NULL.

ObjectiveGit/GTBlameHunk.h

@@ -12,6 +12,11 @@
 
 @implementation GTBlameHunk
 
+- (instancetype)init {
+	NSAssert(NO, @"Call to an unavailable initializer.");
+	return nil;
+}
+
 - (instancetype)initWithGitBlameHunk:(git_blame_hunk)hunk {
 	self = [super init];
 	if (self == nil) return nil;

ObjectiveGit/GTBlameHunk.m

@@ -54,6 +54,8 @@ NS_ASSUME_NONNULL_BEGIN
 + (NSString *)localNamePrefix;
 + (NSString *)remoteNamePrefix;
 
+- (instancetype)init NS_UNAVAILABLE;
+
 /// Designated initializer.
 ///
 /// ref  - The branch reference to wrap. Must not be nil.

ObjectiveGit/GTBranch.h

@@ -69,6 +69,11 @@ + (nullable instancetype)branchWithReference:(GTReference *)ref repository:(GTRe
 	return [[self alloc] initWithReference:ref repository:repo];
 }
 
+- (instancetype)init {
+	NSAssert(NO, @"Call to an unavailable initializer.");
+	return nil;
+}
+
 - (nullable instancetype)initWithReference:(GTReference *)ref repository:(GTRepository *)repo {
 	NSParameterAssert(ref != nil);
 	NSParameterAssert(repo != nil);
@@ -146,7 +151,7 @@ - (GTBranchType)branchType {
 }
 
 - (NSArray *)uniqueCommitsRelativeToBranch:(GTBranch *)otherBranch error:(NSError **)error {
-	GTEnumerator *enumerator = [self.repository enumerateUniqueCommitsUpToOID:self.OID relativeToOID:otherBranch.OID error:error];
+	GTEnumerator *enumerator = [self.repository enumeratorForUniqueCommitsFromOID:self.OID relativeToOID:otherBranch.OID error:error];
 	return [enumerator allObjectsWithError:error];
 }
 

ObjectiveGit/GTBranch.m

@@ -23,6 +23,8 @@ NS_ASSUME_NONNULL_BEGIN
 /// repository, this will always be nil.
 @property (nonatomic, readonly, copy, nullable) NSArray *remotes;
 
+- (instancetype)init NS_UNAVAILABLE;
+
 /// Creates and returns a configuration which includes the global, XDG, and
 /// system configurations.
 + (nullable instancetype)defaultConfiguration;

ObjectiveGit/GTConfiguration.h

@@ -33,6 +33,11 @@ - (void)dealloc {
 	}
 }
 
+- (instancetype)init {
+	NSAssert(NO, @"Call to an unavailable initializer.");
+	return nil;
+}
+
 - (instancetype)initWithGitConfig:(git_config *)config repository:(GTRepository *)repository {
 	NSParameterAssert(config != NULL);