Skip to content

Commit 3933604

Browse files
tiennouhannesa2
authored andcommitted
Update to libgit2 1.0.0
1 parent d872ee9 commit 3933604

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

External/libgit2

Submodule libgit2 updated 699 files

ObjectiveGit/GTCredential+Private.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ typedef struct {
2727
__unsafe_unretained GTCredentialProvider *credProvider;
2828
} GTCredentialAcquireCallbackInfo;
2929

30-
int GTCredentialAcquireCallback(git_cred **cred, const char *url, const char *username_from_url, unsigned int allowed_types, void *payload);
30+
int GTCredentialAcquireCallback(git_credential **cred, const char *url, const char *username_from_url, unsigned int allowed_types, void *payload);

ObjectiveGit/GTCredential.h

+7-7
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
#import "git2/transport.h"
1111

1212
/// An enum describing the data needed for authentication.
13-
/// See `git_credtype_t`.
13+
/// See `git_credential_t`.
1414
typedef NS_ENUM(NSInteger, GTCredentialType) {
15-
GTCredentialTypeUserPassPlaintext = GIT_CREDTYPE_USERPASS_PLAINTEXT,
16-
GTCredentialTypeSSHKey = GIT_CREDTYPE_SSH_KEY,
17-
GTCredentialTypeSSHCustom = GIT_CREDTYPE_SSH_CUSTOM,
15+
GTCredentialTypeUserPassPlaintext = GIT_CREDENTIAL_USERPASS_PLAINTEXT,
16+
GTCredentialTypeSSHKey = GIT_CREDENTIAL_SSH_KEY,
17+
GTCredentialTypeSSHCustom = GIT_CREDENTIAL_SSH_CUSTOM,
1818
};
1919

2020
NS_ASSUME_NONNULL_BEGIN
@@ -50,7 +50,7 @@ NS_ASSUME_NONNULL_BEGIN
5050
@end
5151

5252
/// The GTCredential class is used to provide authentication data.
53-
/// It acts as a wrapper around `git_cred` objects.
53+
/// It acts as a wrapper around `git_credential` objects.
5454
@interface GTCredential : NSObject
5555

5656
/// Create a credential object from a username/password pair.
@@ -86,8 +86,8 @@ NS_ASSUME_NONNULL_BEGIN
8686
/// Return a new GTCredential instance, or nil if an error occurred
8787
+ (instancetype _Nullable)credentialWithUserName:(NSString *)userName publicKeyString:(NSString * _Nullable)publicKeyString privateKeyString:(NSString *)privateKeyString passphrase:(NSString * _Nullable)passphrase error:(NSError **)error;
8888

89-
/// The underlying `git_cred` object.
90-
- (git_cred *)git_cred __attribute__((objc_returns_inner_pointer));
89+
/// The underlying `git_credential` object.
90+
- (git_credential *)git_credential __attribute__((objc_returns_inner_pointer));
9191

9292
@end
9393

ObjectiveGit/GTRepository.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ typedef NS_ENUM(NSInteger, GTRepositoryStateType) {
239239
/// May be NULL.
240240
///
241241
/// returns nil (and fills the error parameter) if an error occurred, or a GTRepository object if successful.
242-
+ (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;
242+
+ (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;
243243

244244
/// Lookup objects in the repo by oid or sha1
245245
- (id _Nullable)lookUpObjectByOID:(GTOID *)oid objectType:(GTObjectType)type error:(NSError **)error;

0 commit comments

Comments
 (0)