Merge remote-tracking branch 'upstream/master'

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

@@ -308,7 +308,7 @@ typedef NS_OPTIONS(NSInteger, GTDiffFindOptionsFlags) {
 - (git_diff *)git_diff __attribute__((objc_returns_inner_pointer));
 
 /// The number of deltas of the given type that are contained in the diff.
-- (NSUInteger)numberOfDeltasWithType:(GTDiffDeltaType)deltaType;
+- (NSUInteger)numberOfDeltasWithType:(GTDeltaType)deltaType;
 
 /// Enumerate the deltas in a diff.
 ///

ObjectiveGit/Categories/NSError+Git.h

@@ -234,7 +234,7 @@ - (NSUInteger)deltaCount {
 	return git_diff_num_deltas(self.git_diff);
 }
 
-- (NSUInteger)numberOfDeltasWithType:(GTDiffDeltaType)deltaType {
+- (NSUInteger)numberOfDeltasWithType:(GTDeltaType)deltaType {
 	return git_diff_num_deltas_of_type(self.git_diff, (git_delta_t)deltaType);
 }