Merge remote-tracking branch 'upstream/master' into git-notes

Author: slavikus

.travis.yml

@@ -1,12 +1,12 @@
-osx_image: xcode7
+osx_image: xcode8
 language: objective-c
 matrix:
   fast_finish: true
   include:
-    - osx_image: xcode7.3
+    - osx_image: xcode8
       env:
         - SCHEME="ObjectiveGit Mac"
-    - osx_image: xcode7.3
+    - osx_image: xcode8
       env:
         - SCHEME="ObjectiveGit iOS"
 before_install:

Cartfile.resolved

@@ -1,4 +1,4 @@
-github "Quick/Nimble" "v4.0.0"
-github "Quick/Quick" "v0.9.2"
-github "ZipArchive/ZipArchive" "v1.1"
+github "Quick/Nimble" "v4.1.0"
+github "Quick/Quick" "v0.9.3"
+github "ZipArchive/ZipArchive" "v1.6.2"
 github "jspahrsummers/xcconfigs" "0.9"

Carthage/Checkouts/Nimble

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2012 libgit2 contributors
+Copyright (c) 2016 libgit2 contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Carthage/Checkouts/Quick

@@ -29,8 +29,12 @@
 
 #import <Foundation/Foundation.h>
 
+/// The error domain used by Objective-Git
 extern NSString * const GTGitErrorDomain;
 
+/// Error userinfo keys
+extern NSString * const GTGitErrorOID;
+
 @interface NSError (Git)
 
 /// Describes the given libgit2 error code, using any message provided by

Carthage/Checkouts/ZipArchive

@@ -31,6 +31,7 @@
 #import "git2/errors.h"
 
 NSString * const GTGitErrorDomain = @"GTGitErrorDomain";
+NSString * const GTGitErrorOID = @"GTOID";
 
 @implementation NSError (Git)
 

LICENSE

@@ -117,6 +117,16 @@ NS_ASSUME_NONNULL_BEGIN
 /// Returns a (possibly empty) array of GTCommits, or nil if an error occurs.
 - (nullable NSArray<GTCommit *> *)allObjectsWithError:(NSError **)error;
 
+/// Get the next OID.
+///
+/// success - If not NULL, this will be set to whether getting the next object
+///           was successful. This will be YES if the receiver is exhausted, so
+///           it can be used to interpret the meaning of a nil return value.
+/// error   - If not NULL, set to any error that occurs during traversal.
+///
+/// Returns nil if an error occurs or the enumeration is done.
+- (nullable GTOID *)nextOIDWithSuccess:(nullable BOOL *)success error:(NSError **)error;
+
 /// Gets the next commit.
 ///
 /// success - If not NULL, this will be set to whether getting the next object

ObjectiveGit/Categories/NSError+Git.h

@@ -145,16 +145,34 @@ - (void)resetWithOptions:(GTEnumeratorOptions)options {
 
 #pragma mark Enumerating
 
-- (GTCommit *)nextObjectWithSuccess:(BOOL *)success error:(NSError **)error {
+- (GTOID *)nextOIDWithSuccess:(BOOL *)success error:(NSError **)error {
 	git_oid oid;
+
 	int gitError = git_revwalk_next(&oid, self.walk);
 	if (gitError == GIT_ITEROVER) {
 		if (success != NULL) *success = YES;
 		return nil;
 	}
+	if (gitError != GIT_OK) {
+		if (success != NULL) *success = NO;
+		if (error != NULL) *error = [NSError git_errorFor:gitError description:@"Enumeration failed"];
+		return nil;
+	}
+
+	if (success != NULL) *success = YES;
+	return [GTOID oidWithGitOid:&oid];
+}
+
+- (GTCommit *)nextObjectWithSuccess:(BOOL *)success error:(NSError **)error {
+	GTOID *oid = [self nextOIDWithSuccess:success error:error];
+	if (oid == nil) {
+		// We don't care whether the iteration completed, or an error occurred,
+		// there's nothing to lookup.
+		return nil;
+	}
 
 	// Ignore error if we can't lookup object and just return nil.
-	GTCommit *commit = [self.repository lookUpObjectByGitOid:&oid objectType:GTObjectTypeCommit error:error];
+	GTCommit *commit = [self.repository lookUpObjectByOID:oid objectType:GTObjectTypeCommit error:error];
 	if (success != NULL) *success = (commit != nil);
 	return commit;
 }