Merge pull request #466 from libgit2/bump-libgit2

[WIP] Bump libgit2

Author: joshaber

External/libgit2

@@ -73,7 +73,7 @@ + (instancetype)diffDeltaFromBlob:(GTBlob *)oldBlob forPath:(NSString *)oldBlobP
 	__block git_diff_delta diffDelta;
 
 	int returnValue = [GTDiff handleParsedOptionsDictionary:options usingBlock:^(git_diff_options *optionsStruct) {
-		return git_diff_blobs(oldBlob.git_blob, oldBlobPath.UTF8String, newBlob.git_blob, newBlobPath.UTF8String, optionsStruct, &GTDiffDeltaCallback, NULL, NULL, &diffDelta);
+		return git_diff_blobs(oldBlob.git_blob, oldBlobPath.UTF8String, newBlob.git_blob, newBlobPath.UTF8String, optionsStruct, &GTDiffDeltaCallback, NULL, NULL, NULL, &diffDelta);
 	}];
 
 	if (returnValue != GIT_OK) {
@@ -94,7 +94,7 @@ + (instancetype)diffDeltaFromBlob:(GTBlob *)blob forPath:(NSString *)blobPath to
 	__block git_diff_delta diffDelta;
 
 	int returnValue = [GTDiff handleParsedOptionsDictionary:options usingBlock:^(git_diff_options *optionsStruct) {
-		return git_diff_blob_to_buffer(blob.git_blob, blobPath.UTF8String, data.bytes, data.length, dataPath.UTF8String, optionsStruct, &GTDiffDeltaCallback, NULL, NULL, &diffDelta);
+		return git_diff_blob_to_buffer(blob.git_blob, blobPath.UTF8String, data.bytes, data.length, dataPath.UTF8String, optionsStruct, &GTDiffDeltaCallback, NULL, NULL, NULL, &diffDelta);
 	}];
 
 	if (returnValue != GIT_OK) {
@@ -115,7 +115,7 @@ + (instancetype)diffDeltaFromData:(NSData *)oldData forPath:(NSString *)oldDataP
 	__block git_diff_delta diffDelta;
 
 	int returnValue = [GTDiff handleParsedOptionsDictionary:options usingBlock:^(git_diff_options *optionsStruct) {
-		return git_diff_buffers(oldData.bytes, oldData.length, oldDataPath.UTF8String, newData.bytes, newData.length, newDataPath.UTF8String, optionsStruct, &GTDiffDeltaCallback, NULL, NULL, &diffDelta);
+		return git_diff_buffers(oldData.bytes, oldData.length, oldDataPath.UTF8String, newData.bytes, newData.length, newDataPath.UTF8String, optionsStruct, &GTDiffDeltaCallback, NULL, NULL, NULL, &diffDelta);
 	}];
 
 	if (returnValue != GIT_OK) {

ObjectiveGit/GTDiffDelta.m

@@ -115,7 +115,7 @@ - (NSString *)URLString {
 }
 
 - (void)setURLString:(NSString *)URLString {
-	git_remote_set_url(self.git_remote, URLString.UTF8String);
+	git_remote_set_url(self.repository.git_repository, self.name.UTF8String, URLString.UTF8String);
 }
 
 - (NSString *)pushURLString {
@@ -126,23 +126,7 @@ - (NSString *)pushURLString {
 }
 
 - (void)setPushURLString:(NSString *)pushURLString {
-	git_remote_set_pushurl(self.git_remote, pushURLString.UTF8String);
-}
-
-- (BOOL)updatesFetchHead {
-	return git_remote_update_fetchhead(self.git_remote) != 0;
-}
-
-- (void)setUpdatesFetchHead:(BOOL)updatesFetchHead {
-	git_remote_set_update_fetchhead(self.git_remote, updatesFetchHead);
-}
-
-- (GTRemoteAutoTagOption)autoTag {
-	return (GTRemoteAutoTagOption)git_remote_autotag(self.git_remote);
-}
-
-- (void)setAutoTag:(GTRemoteAutoTagOption)autoTag {
-	git_remote_set_autotag(self.git_remote, (git_remote_autotag_option_t)autoTag);
+	git_remote_set_pushurl(self.repository.git_repository, self.name.UTF8String, pushURLString.UTF8String);
 }
 
 - (BOOL)isConnected {
@@ -196,45 +180,34 @@ - (NSArray *)pushRefspecs {
 
 #pragma mark Update the remote
 
-- (BOOL)saveRemote:(NSError **)error {
-	int gitError = git_remote_save(self.git_remote);
-	if (gitError != GIT_OK) {
-		if (error != NULL) {
-			*error = [NSError git_errorFor:gitError description:@"Failed to save remote configuration."];
-		}
-		return NO;
-	}
-	return YES;
-}
-
 - (BOOL)updateURLString:(NSString *)URLString error:(NSError **)error {
 	NSParameterAssert(URLString != nil);
 
 	if ([self.URLString isEqualToString:URLString]) return YES;
 
-	int gitError = git_remote_set_url(self.git_remote, URLString.UTF8String);
+	int gitError = git_remote_set_url(self.repository.git_repository, self.name.UTF8String, URLString.UTF8String);
 	if (gitError != GIT_OK) {
 		if (error != NULL) {
 			*error = [NSError git_errorFor:gitError description:@"Failed to update remote URL string."];
 		}
 		return NO;
 	}
-	return [self saveRemote:error];
+	return YES;
 }
 
 - (BOOL)addFetchRefspec:(NSString *)fetchRefspec error:(NSError **)error {
 	NSParameterAssert(fetchRefspec != nil);
 
 	if ([self.fetchRefspecs containsObject:fetchRefspec]) return YES;
 
-	int gitError = git_remote_add_fetch(self.git_remote, fetchRefspec.UTF8String);
+	int gitError = git_remote_add_fetch(self.repository.git_repository, self.name.UTF8String, fetchRefspec.UTF8String);
 	if (gitError != GIT_OK) {
 		if (error != NULL) {
 			*error = [NSError git_errorFor:gitError description:@"Failed to add fetch refspec."];
 		}
 		return NO;
 	}
-	return [self saveRemote:error];
+	return YES;
 }
 
 @end

ObjectiveGit/GTRemote.m

@@ -21,7 +21,6 @@
 
 #import "git2/errors.h"
 #import "git2/remote.h"
-#import "git2/push.h"
 
 NSString *const GTRepositoryRemoteOptionsCredentialProvider = @"GTRepositoryRemoteOptionsCredentialProvider";
 
@@ -62,10 +61,10 @@ int GTRemotePushTransferProgressCallback(unsigned int current, unsigned int tota
 	return (stop == YES ? GIT_EUSER : 0);
 }
 
-#pragma mark -
-#pragma mark Fetch
+#pragma mark - Fetch
 
 - (BOOL)fetchRemote:(GTRemote *)remote withOptions:(NSDictionary *)options error:(NSError **)error progress:(GTRemoteFetchTransferProgressBlock)progressBlock {
+
 	GTCredentialProvider *credProvider = options[GTRepositoryRemoteOptionsCredentialProvider];
 	GTRemoteConnectionInfo connectionInfo = {
 		.credProvider = {credProvider},
@@ -79,14 +78,11 @@ - (BOOL)fetchRemote:(GTRemote *)remote withOptions:(NSDictionary *)options error
 		.payload = &connectionInfo,
 	};
 
-	int gitError = git_remote_set_callbacks(remote.git_remote, &remote_callbacks);
-	if (gitError != GIT_OK) {
-		if (error != NULL) *error = [NSError git_errorFor:gitError description:@"Failed to set callbacks on remote"];
-		return NO;
-	}
+	git_fetch_options fetchOptions = GIT_FETCH_OPTIONS_INIT;
+	fetchOptions.callbacks = remote_callbacks;
 
 	__block git_strarray refspecs;
-	gitError = git_remote_get_fetch_refspecs(&refspecs, remote.git_remote);
+	int gitError = git_remote_get_fetch_refspecs(&refspecs, remote.git_remote);
 	if (gitError != GIT_OK) {
 		if (error != NULL) *error = [NSError git_errorFor:gitError description:@"Failed to get fetch refspecs for remote"];
 		return NO;
@@ -96,7 +92,9 @@ - (BOOL)fetchRemote:(GTRemote *)remote withOptions:(NSDictionary *)options error
 		git_strarray_free(&refspecs);
 	};
 
-	gitError = git_remote_fetch(remote.git_remote, &refspecs, NULL);
+	NSString *reflog_message = [NSString stringWithFormat:@"fetching remote %@", remote.name];
+
+	gitError = git_remote_fetch(remote.git_remote, &refspecs, &fetchOptions, reflog_message.UTF8String);
 	if (gitError != GIT_OK) {
 		if (error != NULL) *error = [NSError git_errorFor:gitError description:@"Failed to fetch from remote"];
 		return NO;
@@ -105,8 +103,7 @@ - (BOOL)fetchRemote:(GTRemote *)remote withOptions:(NSDictionary *)options error
 	return YES;
 }
 
-#pragma mark -
-#pragma mark Fetch Head enumeration
+#pragma mark - Fetch Head Enumeration
 
 typedef void (^GTRemoteEnumerateFetchHeadEntryBlock)(GTFetchHeadEntry *entry, BOOL *stop);
 
@@ -210,6 +207,7 @@ - (BOOL)deleteBranch:(GTBranch *)branch fromRemote:(GTRemote *)remote withOption
 #pragma mark - Push (Private)
 
 - (BOOL)pushRefspecs:(NSArray *)refspecs toRemote:(GTRemote *)remote withOptions:(NSDictionary *)options error:(NSError **)error progress:(GTRemotePushTransferProgressBlock)progressBlock {
+
 	int gitError;
 	GTCredentialProvider *credProvider = options[GTRepositoryRemoteOptionsCredentialProvider];
 
@@ -224,21 +222,13 @@ - (BOOL)pushRefspecs:(NSArray *)refspecs toRemote:(GTRemote *)remote withOptions
 	remote_callbacks.transfer_progress = GTRemoteFetchTransferProgressCallback,
 	remote_callbacks.payload = &connectionInfo,
 
-	gitError = git_remote_set_callbacks(remote.git_remote, &remote_callbacks);
-	if (gitError != GIT_OK) {
-		if (error != NULL) *error = [NSError git_errorFor:gitError description:@"Failed to set callbacks on remote"];
-		return NO;
-	}
-
-	gitError = git_remote_connect(remote.git_remote, GIT_DIRECTION_PUSH);
+	gitError = git_remote_connect(remote.git_remote, GIT_DIRECTION_PUSH, &remote_callbacks);
 	if (gitError != GIT_OK) {
 		if (error != NULL) *error = [NSError git_errorFor:gitError description:@"Failed to connect remote"];
 		return NO;
 	}
 	@onExit {
 		git_remote_disconnect(remote.git_remote);
-		// Clear out callbacks by overwriting with an effectively empty git_remote_callbacks struct
-		git_remote_set_callbacks(remote.git_remote, &((git_remote_callbacks)GIT_REMOTE_CALLBACKS_INIT));
 	};
 
 	git_push_options push_options = GIT_PUSH_OPTIONS_INIT;
@@ -257,7 +247,12 @@ - (BOOL)pushRefspecs:(NSArray *)refspecs toRemote:(GTRemote *)remote withOptions
 		return NO;
 	}
 
-	gitError = git_remote_update_tips(remote.git_remote, NULL);
+	int update_fetchhead = 1;
+	// Ignored for push
+	git_remote_autotag_option_t download_tags = GIT_REMOTE_DOWNLOAD_TAGS_FALLBACK;
+	NSString *reflog_message = [NSString stringWithFormat:@"pushing remote %@", remote.name];
+
+	gitError = git_remote_update_tips(remote.git_remote, &remote_callbacks, update_fetchhead, download_tags, reflog_message.UTF8String);
 	if (gitError != GIT_OK) {
 		if (error != NULL) *error = [NSError git_errorFor:gitError description:@"Update tips failed"];
 		return NO;

ObjectiveGit/GTRepository+RemoteOperations.m

@@ -212,19 +212,12 @@ static int transferProgressCallback(const git_transfer_progress *progress, void
 static int remoteCreate(git_remote **remote, git_repository *repo, const char *name, const char *url, void *payload)
 {
 	int error;
-	struct GTRemoteCreatePayload *pld = payload;
-	git_remote_callbacks *callbacks = &pld->remoteCallbacks;
-
 	if ((error = git_remote_create(remote, repo, name, url)) < 0)
 		return error;
 
-	return git_remote_set_callbacks(*remote, callbacks);
+	return GIT_OK;
 }
 
-struct GTRemoteCreatePayload {
-	git_remote_callbacks remoteCallbacks;
-};
-
 + (instancetype)cloneFromURL:(NSURL *)originURL toWorkingDirectory:(NSURL *)workdirURL options:(NSDictionary *)options error:(NSError **)error transferProgressBlock:(void (^)(const git_transfer_progress *, BOOL *stop))transferProgressBlock checkoutProgressBlock:(void (^)(NSString *path, NSUInteger completedSteps, NSUInteger totalSteps))checkoutProgressBlock {
 
 	git_clone_options cloneOptions = GIT_CLONE_OPTIONS_INIT;
@@ -248,22 +241,19 @@ + (instancetype)cloneFromURL:(NSURL *)originURL toWorkingDirectory:(NSURL *)work
 		.credProvider = {provider},
 	};
 
-	cloneOptions.remote_callbacks.version = GIT_REMOTE_CALLBACKS_VERSION;
+	git_fetch_options fetchOptions = GIT_FETCH_OPTIONS_INIT;
+	fetchOptions.callbacks.version = GIT_REMOTE_CALLBACKS_VERSION;
 
 	if (provider) {
-		cloneOptions.remote_callbacks.credentials = GTCredentialAcquireCallback;
+		fetchOptions.callbacks.credentials = GTCredentialAcquireCallback;
 	}
 
 	payload.transferProgressBlock = transferProgressBlock;
 
-	cloneOptions.remote_callbacks.transfer_progress = transferProgressCallback;
-	cloneOptions.remote_callbacks.payload = &payload;
-
-	struct GTRemoteCreatePayload remoteCreatePayload;
-	remoteCreatePayload.remoteCallbacks = cloneOptions.remote_callbacks;
-
+	fetchOptions.callbacks.transfer_progress = transferProgressCallback;
+	fetchOptions.callbacks.payload = &payload;
+	cloneOptions.fetch_opts = fetchOptions;
 	cloneOptions.remote_cb = remoteCreate;
-	cloneOptions.remote_cb_payload = &remoteCreatePayload;
 
 	BOOL localClone = [options[GTRepositoryCloneOptionsCloneLocal] boolValue];
 	if (localClone) {
@@ -295,6 +285,8 @@ + (instancetype)cloneFromURL:(NSURL *)originURL toWorkingDirectory:(NSURL *)work
 	}
 
 	return [[self alloc] initWithGitRepository:repository];
+
+	return nil;
 }
 
 - (id)lookUpObjectByGitOid:(const git_oid *)oid objectType:(GTObjectType)type error:(NSError **)error {

ObjectiveGit/GTRepository.m

@@ -16,14 +16,15 @@
 
 __block GTRemote *remote = nil;
 __block GTRepository *repository = nil;
+__block GTConfiguration *configuration = nil;
 NSString *fetchRefspec = @"+refs/heads/*:refs/remotes/origin/*";
 
 beforeEach(^{
 	repository = self.testAppFixtureRepository;
 	expect(repository).notTo(beNil());
 
 	NSError *error = nil;
-	GTConfiguration *configuration = [repository configurationWithError:&error];
+	configuration = [repository configurationWithError:&error];
 	expect(configuration).notTo(beNil());
 	expect(error).to(beNil());
 
@@ -53,6 +54,9 @@
 		expect(@([remote updateURLString:newURLString error:&error])).to(beTruthy());
 		expect(error).to(beNil());
 
+		// Reload remote from disk to pick up the change
+		remote = configuration.remotes[0];
+
 		expect(remote.URLString).to(equal(newURLString));
 	});
 
@@ -65,6 +69,9 @@
 		expect(@([remote addFetchRefspec:newFetchRefspec error:&error])).to(beTruthy());
 		expect(error).to(beNil());
 
+		// Reload remote from disk to pick up the change
+		remote = configuration.remotes[0];
+
 		expect(remote.fetchRefspecs).to(equal((@[ fetchRefspec, newFetchRefspec ])));
 	});
 });