Merge pull request #651 from libgit2/xcode-9.3

👷🏻‍♀️🛠 Xcode 9.3

Author: phatblat

.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"

Carthage/Checkouts/Nimble

@@ -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.
 ///

Carthage/Checkouts/Quick

@@ -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

Carthage/Checkouts/ZipArchive

@@ -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;