diff --git a/Classes/GTRepository+RemoteOperations.m b/Classes/GTRepository+RemoteOperations.m index dcf096811..26f338e79 100644 --- a/Classes/GTRepository+RemoteOperations.m +++ b/Classes/GTRepository+RemoteOperations.m @@ -62,7 +62,18 @@ - (BOOL)fetchRemote:(GTRemote *)remote withOptions:(NSDictionary *)options error return NO; } - gitError = git_remote_fetch(remote.git_remote, self.userSignatureForNow.git_signature, NULL); + __block git_strarray refspecs; + 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; + } + + @onExit { + git_strarray_free(&refspecs); + }; + + gitError = git_remote_fetch(remote.git_remote, &refspecs, self.userSignatureForNow.git_signature, NULL); if (gitError != GIT_OK) { if (error != NULL) *error = [NSError git_errorFor:gitError description:@"Failed to fetch from remote"]; return NO; diff --git a/Classes/GTRepository+Reset.m b/Classes/GTRepository+Reset.m index 7481a325a..1ab853518 100644 --- a/Classes/GTRepository+Reset.m +++ b/Classes/GTRepository+Reset.m @@ -17,7 +17,8 @@ @implementation GTRepository (Reset) - (BOOL)resetToCommit:(GTCommit *)commit resetType:(GTRepositoryResetType)resetType error:(NSError **)error { NSParameterAssert(commit != nil); - int gitError = git_reset(self.git_repository, commit.git_object, (git_reset_t)resetType, (git_signature *)[self userSignatureForNow].git_signature, NULL); + git_checkout_options options = GIT_CHECKOUT_OPTIONS_INIT; + int gitError = git_reset(self.git_repository, commit.git_object, (git_reset_t)resetType, &options, (git_signature *)[self userSignatureForNow].git_signature, NULL); if (gitError != GIT_OK) { if (error != NULL) { *error = [NSError git_errorFor:gitError description:@"Failed to reset repository to commit %@.", commit.SHA]; diff --git a/External/libgit2 b/External/libgit2 index 2cd3cb8e0..4bb6ffb6b 160000 --- a/External/libgit2 +++ b/External/libgit2 @@ -1 +1 @@ -Subproject commit 2cd3cb8e03591e08c1cc1890ae5b82a498773f19 +Subproject commit 4bb6ffb6bb8ad9d49eb173350be965183cd09c96