Merge pull request #410 from libgit2/update-libgit2

Update libgit2

Author: mdiep

Classes/GTBranch.m

@@ -215,7 +215,7 @@ - (BOOL)calculateAhead:(size_t *)ahead behind:(size_t *)behind relativeTo:(GTBra
 		return YES;
 	}
 
-	int errorCode = git_graph_ahead_behind(ahead, behind, self.repository.git_repository, branch.reference.git_oid, self.reference.git_oid);
+	int errorCode = git_graph_ahead_behind(ahead, behind, self.repository.git_repository, self.reference.git_oid, branch.reference.git_oid);
 	if (errorCode != GIT_OK && error != NULL) {
 		*error = [NSError git_errorFor:errorCode description:@"Failed to calculate ahead/behind count of %@ relative to %@", self, branch];
 		return NO;

Classes/GTRemote.h

@@ -64,9 +64,6 @@ typedef enum {
 /// Tests if a URL is supported (e.g. it's a supported URL scheme)
 + (BOOL)isSupportedURLString:(NSString *)URLString;
 
-/// Tests if a URL is valid (e.g. it actually makes sense as a URL)
-+ (BOOL)isValidURLString:(NSString *)URLString;
-
 /// Tests if a name is valid
 + (BOOL)isValidRemoteName:(NSString *)name;
 

Classes/GTRemote.m

@@ -90,12 +90,6 @@ - (NSUInteger)hash {
 
 #pragma mark API
 
-+ (BOOL)isValidURLString:(NSString *)URLString {
-	NSParameterAssert(URLString != nil);
-
-	return git_remote_valid_url(URLString.UTF8String) == GIT_OK;
-}
-
 + (BOOL)isSupportedURLString:(NSString *)URLString {
 	NSParameterAssert(URLString != nil);
 

Classes/GTRepository.h

@@ -81,10 +81,7 @@ typedef NS_OPTIONS(NSInteger, GTCheckoutNotifyFlags) {
 
 /// Transport flags sent as options to +cloneFromURL... method
 typedef NS_OPTIONS(NSInteger, GTTransportFlags) {
-	GTTransportFlagsNone = GIT_TRANSPORTFLAGS_NONE,
-	// If you pass this flag and the connection is secured with SSL/TLS,
-	// the authenticity of the server certificate will not be verified.
-	GTTransportFlagsNoCheckCert = GIT_TRANSPORTFLAGS_NO_CHECK_CERT,
+	GTTransportFlagsNone = GIT_TRANSPORTFLAGS_NONE
 };
 
 /// An `NSNumber` wrapped `GTTransportFlags`, documented above.

Classes/GTRepository.m

@@ -196,15 +196,11 @@ static int remoteCreate(git_remote **remote, git_repository *repo, const char *n
 	if ((error = git_remote_create(remote, repo, name, url)) < 0)
 		return error;
 
-	if (pld->ignoreCertErrors)
-		git_remote_check_cert(*remote, !pld->ignoreCertErrors);
-	
 	return git_remote_set_callbacks(*remote, callbacks);
 }
 
 struct GTRemoteCreatePayload {
 	git_remote_callbacks remoteCallbacks;
-	BOOL ignoreCertErrors;
 };
 
 + (id)cloneFromURL:(NSURL *)originURL toWorkingDirectory:(NSURL *)workdirURL options:(NSDictionary *)options error:(NSError **)error transferProgressBlock:(void (^)(const git_transfer_progress *))transferProgressBlock checkoutProgressBlock:(void (^)(NSString *path, NSUInteger completedSteps, NSUInteger totalSteps))checkoutProgressBlock {
@@ -240,12 +236,9 @@ + (id)cloneFromURL:(NSURL *)originURL toWorkingDirectory:(NSURL *)workdirURL opt
 
 	cloneOptions.remote_callbacks.transfer_progress = transferProgressCallback;
 	cloneOptions.remote_callbacks.payload = &payload;
-	
-	NSNumber *transportFlags = options[GTRepositoryCloneOptionsTransportFlags];
 
 	struct GTRemoteCreatePayload remoteCreatePayload;
 	remoteCreatePayload.remoteCallbacks = cloneOptions.remote_callbacks;
-	remoteCreatePayload.ignoreCertErrors = (transportFlags == nil ? 0 : 1);
 
 	cloneOptions.remote_cb = remoteCreate;
 	cloneOptions.remote_cb_payload = &remoteCreatePayload;