Merge pull request #651 from libgit2/xcode-9.3

👷🏻‍♀️🛠 Xcode 9.3

.travis.yml

@@ -1,18 +1,30 @@
-osx_image: xcode8.3
+#
+# .travis.yml
+# Objective-Git
+#
+# https://docs.travis-ci.com/user/reference/osx/
+# https://docs.travis-ci.com/user/build-stages/matrix-expansion/
+#
+---
+os: osx
+osx_image: xcode9.3
 language: objective-c
+
 matrix:
   fast_finish: true
   include:
-    - osx_image: xcode8.3
+    - osx_image: xcode9.3
       env:
         - SCHEME="ObjectiveGit Mac"
-    - osx_image: xcode8.3
+    - osx_image: xcode9.3
       env:
         - SCHEME="ObjectiveGit iOS"
+
 before_install:
   - gem install xcpretty
   - gem install xcpretty-travis-formatter
 install: script/bootstrap
 script: script/cibuild
+
 notifications:
   email: false

Cartfile.private

@@ -1,4 +1,4 @@
-github "jspahrsummers/xcconfigs" >= 0.7.1
-github "Quick/Quick" ~> 1.1.0
-github "Quick/Nimble" ~> 5.0
-github "ZipArchive/ZipArchive" ~> 1.1
+github "jspahrsummers/xcconfigs" "master"
+github "Quick/Quick" ~> 1.2.0
+github "Quick/Nimble" ~> 7.0.3
+github "ZipArchive/ZipArchive" ~> 2.1.2

Cartfile.resolved

@@ -1,4 +1,4 @@
-github "Quick/Nimble" "v5.1.1"
-github "Quick/Quick" "v1.1.0"
-github "ZipArchive/ZipArchive" "v1.8.1"
-github "jspahrsummers/xcconfigs" "0.10"
+github "Quick/Nimble" "v7.0.3"
+github "Quick/Quick" "v1.2.0"
+github "ZipArchive/ZipArchive" "v2.1.2"
+github "jspahrsummers/xcconfigs" "bb795558a76e5daf3688500055bbcfe243bffa8d"

ObjectiveGit/GTBlob.h

@@ -104,8 +104,8 @@ NS_ASSUME_NONNULL_BEGIN
 - (git_blob *)git_blob __attribute__((objc_returns_inner_pointer));
 
 - (git_off_t)size;
-- (NSString *)content;
-- (NSData * _Nullable)data;
+- (NSString * _Nullable)content;
+- (NSData *)data;
 
 /// Attempts to apply the filter list for `path` to the blob.
 ///

ObjectiveGit/GTBranch.m

@@ -124,19 +124,23 @@ - (NSString *)remoteName {
 }
 
 - (GTCommit *)targetCommitWithError:(NSError **)error {
-	if (self.OID == nil) {
+	GTOID *oid = self.OID;
+	if (oid == nil) {
 		if (error != NULL) *error = GTReference.invalidReferenceError;
 		return nil;
 	}
 
-	return [self.repository lookUpObjectByOID:self.OID objectType:GTObjectTypeCommit error:error];
+	return [self.repository lookUpObjectByOID:oid objectType:GTObjectTypeCommit error:error];
 }
 
 - (NSUInteger)numberOfCommitsWithError:(NSError **)error {
 	GTEnumerator *enumerator = [[GTEnumerator alloc] initWithRepository:self.repository error:error];
 	if (enumerator == nil) return NSNotFound;
 
-	if (![enumerator pushSHA:self.OID.SHA error:error]) return NSNotFound;
+	GTOID *oid = self.OID;
+	if (oid == nil) return NSNotFound;
+
+	if (![enumerator pushSHA:oid.SHA error:error]) return NSNotFound;
 	return [enumerator countRemainingObjects:error];
 }
 
@@ -157,7 +161,9 @@ - (BOOL)isHEAD {
 }
 
 - (NSArray *)uniqueCommitsRelativeToBranch:(GTBranch *)otherBranch error:(NSError **)error {
-	GTEnumerator *enumerator = [self.repository enumeratorForUniqueCommitsFromOID:self.OID relativeToOID:otherBranch.OID error:error];
+	GTOID *oid = self.OID;
+	GTOID *otherOID = otherBranch.OID;
+	GTEnumerator *enumerator = [self.repository enumeratorForUniqueCommitsFromOID:oid relativeToOID:otherOID error:error];
 	return [enumerator allObjectsWithError:error];
 }
 
@@ -179,14 +185,21 @@ - (BOOL)rename:(NSString *)name force:(BOOL)force error:(NSError **)error {
 		return NO;
 	}
 
-	_reference = [[GTReference alloc] initWithGitReference:git_ref repository:self.repository];
+	GTReference *renamedRef = [[GTReference alloc] initWithGitReference:git_ref repository:self.repository];
+	NSAssert(renamedRef, @"Unable to allocate renamed ref");
+	_reference = renamedRef;
 
 	return YES;
 }
 
 - (GTBranch *)trackingBranchWithError:(NSError **)error success:(BOOL *)success {
+	BOOL underSuccess = NO;
+	if (success == NULL) {
+		success = &underSuccess;
+	}
+
 	if (self.branchType == GTBranchTypeRemote) {
-		if (success != NULL) *success = YES;
+		*success = YES;
 		return self;
 	}
 
@@ -195,25 +208,32 @@ - (GTBranch *)trackingBranchWithError:(NSError **)error success:(BOOL *)success
 
 	// GIT_ENOTFOUND means no tracking branch found.
 	if (gitError == GIT_ENOTFOUND) {
-		if (success != NULL) *success = YES;
+		*success = YES;
 		return nil;
 	}
 
 	if (gitError != GIT_OK) {
-		if (success != NULL) *success = NO;
+		*success = NO;
 		if (error != NULL) *error = [NSError git_errorFor:gitError description:@"Failed to create reference to tracking branch from %@", self];
 		return nil;
 	}
 
 	if (trackingRef == NULL) {
-		if (success != NULL) *success = NO;
+		*success = NO;
 		if (error != NULL) *error = [NSError git_errorFor:gitError description:@"Got a NULL remote ref for %@", self];
 		return nil;
 	}
 
-	if (success != NULL) *success = YES;
+	GTReference *upsteamRef = [[GTReference alloc] initWithGitReference:trackingRef repository:self.repository];
+	if (upsteamRef == nil) {
+		*success = NO;
+		if (error != NULL) *error = [NSError git_errorFor:GIT_ERROR description:@"Failed to allocate upstream ref"];
+		return nil;
+	}
+
+	*success = YES;
 
-	return [[self class] branchWithReference:[[GTReference alloc] initWithGitReference:trackingRef repository:self.repository]];
+	return [[self class] branchWithReference:upsteamRef];
 }
 
 - (BOOL)updateTrackingBranch:(GTBranch *)trackingBranch error:(NSError **)error {
@@ -239,7 +259,9 @@ - (GTBranch *)reloadedBranchWithError:(NSError **)error {
 }
 
 - (BOOL)calculateAhead:(size_t *)ahead behind:(size_t *)behind relativeTo:(GTBranch *)branch error:(NSError **)error {
-	return [self.repository calculateAhead:ahead behind:behind ofOID:self.OID relativeToOID:branch.OID error:error];
+	GTOID *oid = self.OID;
+	GTOID *branchOID = branch.OID;
+	return [self.repository calculateAhead:ahead behind:behind ofOID:oid relativeToOID:branchOID error:error];
 }
 
 @end

ObjectiveGit/GTCheckoutOptions.h

@@ -87,13 +87,13 @@ typedef NS_OPTIONS(NSInteger, GTCheckoutNotifyFlags) {
 @property (assign) GTCheckoutStrategyType strategy;
 
 /// The checkout progress block that was passed in.
-@property (copy) void (^progressBlock)(NSString *path, NSUInteger completedSteps, NSUInteger totalSteps);
+@property (copy, nullable) void (^progressBlock)(NSString *path, NSUInteger completedSteps, NSUInteger totalSteps);
 
 /// The notification flags currently enabled.
 @property (assign) GTCheckoutNotifyFlags notifyFlags;
 
 /// The checkout notification block that was passed in.
-@property (copy) int (^notifyBlock)(GTCheckoutNotifyFlags why, NSString *path, GTDiffFile *baseline, GTDiffFile *target, GTDiffFile *workdir);
+@property (copy, nullable) int (^notifyBlock)(GTCheckoutNotifyFlags why, NSString *path, GTDiffFile *baseline, GTDiffFile *target, GTDiffFile *workdir);
 
 /// An array of strings used to restrict what will be checked out.
 @property (copy) NSArray <NSString *> *pathSpecs;

ObjectiveGit/GTConfiguration.m

@@ -134,10 +134,12 @@ - (NSArray *)remotes {
 	NSMutableArray *remotes = [NSMutableArray arrayWithCapacity:names.count];
 	for (size_t i = 0; i < names.count; i++) {
 		const char *name = names.strings[i];
-		git_remote *remote = NULL;
+		git_remote *git_remote = NULL;
 
-		if (git_remote_lookup(&remote, repository.git_repository, name) == 0) {
-			[remotes addObject:[[GTRemote alloc] initWithGitRemote:remote inRepository:repository]];
+		if (git_remote_lookup(&git_remote, repository.git_repository, name) == 0) {
+			GTRemote *remote = [[GTRemote alloc] initWithGitRemote:git_remote inRepository:repository];
+			if (remote)
+				[remotes addObject:remote];
 		}
 	}
 

ObjectiveGit/GTDiffDelta.h

@@ -63,10 +63,10 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, assign, readonly) GTDiffFileFlag flags;
 
 /// The file to the "left" of the diff.
-@property (nonatomic, readonly, copy) GTDiffFile *oldFile;
+@property (nonatomic, readonly, copy) GTDiffFile * _Nullable oldFile;
 
 /// The file to the "right" of the diff.
-@property (nonatomic, readonly, copy) GTDiffFile *newFile __attribute__((ns_returns_not_retained));
+@property (nonatomic, readonly, copy) GTDiffFile * _Nullable newFile __attribute__((ns_returns_not_retained));
 
 /// The type of change that this delta represents.
 ///

ObjectiveGit/GTDiffHunk.m

@@ -47,7 +47,9 @@ - (instancetype)initWithPatch:(GTDiffPatch *)patch hunkIndex:(NSUInteger)hunkInd
 
 	_patch = patch;
 	_hunkIndex = hunkIndex;
-	_header = [[[NSString alloc] initWithBytes:self.git_hunk->header length:self.git_hunk->header_len encoding:NSUTF8StringEncoding] stringByTrimmingCharactersInSet:NSCharacterSet.newlineCharacterSet];
+	NSString *hunkHeader = [[[NSString alloc] initWithBytes:self.git_hunk->header length:self.git_hunk->header_len encoding:NSUTF8StringEncoding] stringByTrimmingCharactersInSet:NSCharacterSet.newlineCharacterSet];
+	NSAssert(hunkHeader != nil, @"Failed to build hunk header");
+	_header = hunkHeader;
 
 	return self;
 }

ObjectiveGit/GTEnumerator.m

@@ -259,7 +259,8 @@ - (NSUInteger)countRemainingObjects:(NSError **)error {
 #pragma mark NSEnumerator
 
 - (NSArray *)allObjects {
-	return [self allObjectsWithError:NULL];
+	NSArray *objects = [self allObjectsWithError:NULL];
+	return objects ? objects : [NSArray array];
 }
 
 - (id)nextObject {

ObjectiveGit/GTFilter.m

@@ -96,7 +96,9 @@ static void GTFilterShutdown(git_filter *filter) {
 
 static int GTFilterCheck(git_filter *filter, void **payload, const git_filter_source *src, const char **attr_values) {
 	GTFilter *self = GTFiltersGitFilterToRegisteredFilters[[NSValue valueWithPointer:filter]];
-	BOOL accept = self.checkBlock(payload, [[GTFilterSource alloc] initWithGitFilterSource:src], attr_values);
+	GTFilterSource *source = [[GTFilterSource alloc] initWithGitFilterSource:src];
+	NSCAssert(source != nil, @"Unexpected nil filter source");
+	BOOL accept = self.checkBlock(payload, source, attr_values);
 	return accept ? 0 : GIT_PASSTHROUGH;
 }
 

ObjectiveGit/GTIndex.m

@@ -278,7 +278,9 @@ - (GTTree *)writeTreeToRepository:(GTRepository *)repository error:(NSError **)e
 - (NSArray *)entries {
 	NSMutableArray *entries = [NSMutableArray arrayWithCapacity:self.entryCount];
 	for (NSUInteger i = 0; i < self.entryCount; i++) {
-		[entries addObject:[self entryAtIndex:i]];
+		GTIndexEntry *entry = [self entryAtIndex:i];
+		if (entry)
+			[entries addObject:entry];
 	}
 
 	return entries;

ObjectiveGit/GTOID.h

@@ -16,7 +16,7 @@ NS_ASSUME_NONNULL_BEGIN
 @interface GTOID : NSObject <NSCopying>
 
 /// The SHA pointed to by the OID.
-@property (nonatomic, readonly, copy) NSString * _Nullable SHA;
+@property (nonatomic, readonly, copy) NSString *SHA;
 
 /// Is the OID all zero? This usually indicates that the object has not been
 /// inserted into the ODB yet.

ObjectiveGit/GTOID.m

@@ -55,7 +55,9 @@ - (instancetype)initWithGitOid:(const git_oid *)oid {
 
 - (instancetype)initWithSHA:(NSString *)SHA error:(NSError **)error {
 	NSParameterAssert(SHA != nil);
-	return [self initWithSHACString:SHA.UTF8String error:error];
+	const char *SHACString = SHA.UTF8String;
+	NSAssert(SHACString, @"Unexpected nil SHA");
+	return [self initWithSHACString:SHACString error:error];
 }
 
 - (instancetype)initWithSHA:(NSString *)SHA {

ObjectiveGit/GTObject.h

@@ -52,10 +52,10 @@ NS_ASSUME_NONNULL_BEGIN
 @interface GTObject : NSObject
 
 @property (nonatomic, readonly) NSString *type;
-@property (nonatomic, readonly) NSString * _Nullable SHA;
-@property (nonatomic, readonly) NSString * _Nullable shortSHA;
+@property (nonatomic, readonly) NSString *SHA;
+@property (nonatomic, readonly) NSString *shortSHA;
 @property (nonatomic, readonly, strong) GTRepository *repository;
-@property (nonatomic, readonly) GTOID * _Nullable OID;
+@property (nonatomic, readonly) GTOID *OID;
 
 - (instancetype)init NS_UNAVAILABLE;
 

ObjectiveGit/GTObject.m

@@ -123,7 +123,9 @@ + (id)objectWithObj:(git_object *)theObject inRepository:(GTRepository *)theRepo
 }
 
 - (NSString *)type {
-	return [NSString stringWithUTF8String:git_object_type2string(git_object_type(self.git_object))];
+	NSString *type = [NSString stringWithUTF8String:git_object_type2string(git_object_type(self.git_object))];
+	NSAssert(type != nil, @"type was nil");
+	return type;
 }
 
 - (GTOID *)OID {

ObjectiveGit/GTReference.h

@@ -67,7 +67,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, readonly, getter = isNote) BOOL note;
 
 /// The reflog for the reference.
-@property (nonatomic, readonly, strong) GTReflog *reflog;
+@property (nonatomic, readonly, strong) GTReflog * _Nullable reflog;
 
 /// Convenience initializers
 + (instancetype _Nullable)referenceByResolvingSymbolicReference:(GTReference *)symbolicRef error:(NSError **)error;
@@ -96,7 +96,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, readonly, copy) GTReference *resolvedReference;
 
 /// The OID of the target object.
-@property (nonatomic, readonly, copy) GTOID *targetOID;
+@property (nonatomic, readonly, copy, nullable) GTOID *targetOID;
 
 /// Updates the on-disk reference to point to the target and returns the updated
 /// reference.
@@ -112,7 +112,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (GTReference * _Nullable)referenceByUpdatingTarget:(NSString *)newTarget message:(NSString * _Nullable)message error:(NSError **)error;
 
 /// The name of the reference.
-@property (nonatomic, readonly, copy) NSString * _Nullable name;
+@property (nonatomic, readonly, copy) NSString *name;
 
 /// Updates the on-disk reference to the name and returns the renamed reference.
 ///

ObjectiveGit/GTReference.m

@@ -119,7 +119,7 @@ - (BOOL)isNote {
 
 - (NSString *)name {
 	const char *refName = git_reference_name(self.git_reference);
-	if (refName == NULL) return nil;
+	NSAssert(refName != nil, @"Unexpected nil name");
 
 	return @(refName);
 }
@@ -166,7 +166,8 @@ - (id)resolvedTarget {
 }
 
 - (GTReference *)resolvedReference {
-	return [self.class referenceByResolvingSymbolicReference:self error:NULL];
+	GTReference *resolvedReference = [self.class referenceByResolvingSymbolicReference:self error:NULL];
+	return resolvedReference ? resolvedReference : self;
 }
 
 - (GTOID *)targetOID {

ObjectiveGit/GTRepository.h

@@ -417,7 +417,7 @@ typedef NS_ENUM(NSInteger, GTRepositoryStateType) {
 /// defaults will be used instead. Will never return nil.
 ///
 /// Returns the signature.
-- (GTSignature *)userSignatureForNow;
+- (GTSignature * _Nullable)userSignatureForNow;
 
 /// Enumerates over all the tracked submodules in the repository.
 ///

ObjectiveGit/GTRepository.m

@@ -196,7 +196,9 @@ - (instancetype)initWithURL:(NSURL *)localFileURL flags:(NSInteger)flags ceiling
 			if (idx < ceilingDirURLs.count - 1) {
 				[ceilingDirsString appendString:[NSString stringWithFormat:@"%@%c", url.path, GIT_PATH_LIST_SEPARATOR]];
 			} else {
-				[ceilingDirsString appendString:url.path];
+				NSString *path = url.path;
+				NSAssert(path != nil, @"Unexpected nil path component");
+				[ceilingDirsString appendString:path];
 			}
 		}];
 	}