diff --git a/External/libgit2 b/External/libgit2 index 7a2b969d5..7d3c7057f 160000 --- a/External/libgit2 +++ b/External/libgit2 @@ -1 +1 @@ -Subproject commit 7a2b969d559b83798d93728f24d1729ffc97b717 +Subproject commit 7d3c7057f0e774aecd6fc4ef8333e69e5c4873e0 diff --git a/ObjectiveGit/GTCredential+Private.h b/ObjectiveGit/GTCredential+Private.h index 866b389a7..33a546359 100644 --- a/ObjectiveGit/GTCredential+Private.h +++ b/ObjectiveGit/GTCredential+Private.h @@ -27,4 +27,4 @@ typedef struct { __unsafe_unretained GTCredentialProvider *credProvider; } GTCredentialAcquireCallbackInfo; -int GTCredentialAcquireCallback(git_cred **cred, const char *url, const char *username_from_url, unsigned int allowed_types, void *payload); +int GTCredentialAcquireCallback(git_credential **cred, const char *url, const char *username_from_url, unsigned int allowed_types, void *payload); diff --git a/ObjectiveGit/GTCredential.h b/ObjectiveGit/GTCredential.h index 560a8ba18..a79bee1e2 100644 --- a/ObjectiveGit/GTCredential.h +++ b/ObjectiveGit/GTCredential.h @@ -10,11 +10,11 @@ #import "git2/transport.h" /// An enum describing the data needed for authentication. -/// See `git_credtype_t`. +/// See `git_credential_t`. typedef NS_ENUM(NSInteger, GTCredentialType) { - GTCredentialTypeUserPassPlaintext = GIT_CREDTYPE_USERPASS_PLAINTEXT, - GTCredentialTypeSSHKey = GIT_CREDTYPE_SSH_KEY, - GTCredentialTypeSSHCustom = GIT_CREDTYPE_SSH_CUSTOM, + GTCredentialTypeUserPassPlaintext = GIT_CREDENTIAL_USERPASS_PLAINTEXT, + GTCredentialTypeSSHKey = GIT_CREDENTIAL_SSH_KEY, + GTCredentialTypeSSHCustom = GIT_CREDENTIAL_SSH_CUSTOM, }; NS_ASSUME_NONNULL_BEGIN @@ -50,7 +50,7 @@ NS_ASSUME_NONNULL_BEGIN @end /// The GTCredential class is used to provide authentication data. -/// It acts as a wrapper around `git_cred` objects. +/// It acts as a wrapper around `git_credential` objects. @interface GTCredential : NSObject /// Create a credential object from a username/password pair. @@ -86,8 +86,8 @@ NS_ASSUME_NONNULL_BEGIN /// Return a new GTCredential instance, or nil if an error occurred + (instancetype _Nullable)credentialWithUserName:(NSString *)userName publicKeyString:(NSString * _Nullable)publicKeyString privateKeyString:(NSString *)privateKeyString passphrase:(NSString * _Nullable)passphrase error:(NSError **)error; -/// The underlying `git_cred` object. -- (git_cred *)git_cred __attribute__((objc_returns_inner_pointer)); +/// The underlying `git_credential` object. +- (git_credential *)git_credential __attribute__((objc_returns_inner_pointer)); @end diff --git a/ObjectiveGit/GTRepository.h b/ObjectiveGit/GTRepository.h index b57430b50..28079183b 100644 --- a/ObjectiveGit/GTRepository.h +++ b/ObjectiveGit/GTRepository.h @@ -239,7 +239,7 @@ typedef NS_ENUM(NSInteger, GTRepositoryStateType) { /// May be NULL. /// /// returns nil (and fills the error parameter) if an error occurred, or a GTRepository object if successful. -+ (instancetype _Nullable)cloneFromURL:(NSURL *)originURL toWorkingDirectory:(NSURL *)workdirURL options:(NSDictionary * _Nullable)options error:(NSError **)error transferProgressBlock:(void (^ _Nullable)(const git_transfer_progress *, BOOL *stop))transferProgressBlock; ++ (instancetype _Nullable)cloneFromURL:(NSURL *)originURL toWorkingDirectory:(NSURL *)workdirURL options:(NSDictionary * _Nullable)options error:(NSError **)error transferProgressBlock:(void (^ _Nullable)(const git_indexer_progress *, BOOL *stop))transferProgressBlock; /// Lookup objects in the repo by oid or sha1 - (id _Nullable)lookUpObjectByOID:(GTOID *)oid objectType:(GTObjectType)type error:(NSError **)error;