Skip to content

Commit 7ab537e

Browse files
tiennoutiennou
committed
Update to libgit2 v0.28.0-rc1
1 parent a9cd846 commit 7ab537e

18 files changed

+44
-46
lines changed

‎External/libgit2

Submodule libgit2 updated 6582 files

‎ObjectiveGit/Categories/NSData+Git.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ - (BOOL)git_getOid:(git_oid *)oid error:(NSError **)error {
1717
if ([self length] != sizeof(git_oid)) {
1818
if (error != NULL) {
1919
*error = [NSError errorWithDomain:GTGitErrorDomain
20-
code:GITERR_INVALID
20+
code:GIT_ERROR_INVALID
2121
userInfo:
2222
[NSDictionary dictionaryWithObject:@"can't extract oid from data of incorrect length"
2323
forKey:NSLocalizedDescriptionKey]];

‎ObjectiveGit/Categories/NSError+Git.m

+2-2
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,10 @@ + (NSError *)git_errorFor:(int)code {
9898
}
9999

100100
+ (NSString *)git_descriptionForErrorCode:(int)code {
101-
const git_error *gitLastError = giterr_last();
101+
const git_error *gitLastError = git_error_last();
102102
if (gitLastError != NULL) {
103103
return @(gitLastError->message);
104-
} else if (code == GITERR_OS) {
104+
} else if (code == GIT_ERROR_OS) {
105105
return @(strerror(errno));
106106
} else {
107107
return nil;

‎ObjectiveGit/GTBlob.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ - (instancetype)initWithOid:(const git_oid *)oid inRepository:(GTRepository *)re
6363
NSParameterAssert(repository != nil);
6464

6565
git_object *obj;
66-
int gitError = git_object_lookup(&obj, repository.git_repository, oid, (git_otype) GTObjectTypeBlob);
66+
int gitError = git_object_lookup(&obj, repository.git_repository, oid, (git_object_t) GTObjectTypeBlob);
6767
if (gitError < GIT_OK) {
6868
if (error != NULL) {
6969
*error = [NSError git_errorFor:gitError description:@"Failed to lookup blob"];

‎ObjectiveGit/GTCredential.m

+2-2
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ int GTCredentialAcquireCallback(git_cred **git_cred, const char *url, const char
105105
GTCredentialProvider *provider = info->credProvider;
106106

107107
if (provider == nil) {
108-
giterr_set_str(GIT_EUSER, "No GTCredentialProvider set, but authentication was requested.");
108+
git_error_set_str(GIT_EUSER, "No GTCredentialProvider set, but authentication was requested.");
109109
return GIT_ERROR;
110110
}
111111

@@ -114,7 +114,7 @@ int GTCredentialAcquireCallback(git_cred **git_cred, const char *url, const char
114114

115115
GTCredential *cred = [provider credentialForType:(GTCredentialType)allowed_types URL:URL userName:userName];
116116
if (cred == nil) {
117-
giterr_set_str(GIT_EUSER, "GTCredentialProvider failed to provide credentials.");
117+
git_error_set_str(GIT_EUSER, "GTCredentialProvider failed to provide credentials.");
118118
return GIT_ERROR;
119119
}
120120

‎ObjectiveGit/GTDiffPatch.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ - (NSData *)patchData {
6969
git_patch_to_buf(&buf, self.git_patch);
7070

7171
NSData *buffer = [[NSData alloc] initWithBytes:buf.ptr length:buf.size];
72-
git_buf_free(&buf);
72+
git_buf_dispose(&buf);
7373

7474
return buffer;
7575
}

‎ObjectiveGit/GTIndexEntry.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ + (instancetype)objectWithIndexEntry:(GTIndexEntry *)indexEntry error:(NSError *
127127

128128
- (instancetype)initWithIndexEntry:(GTIndexEntry *)indexEntry error:(NSError **)error {
129129
git_object *obj;
130-
int gitError = git_object_lookup(&obj, indexEntry.repository.git_repository, indexEntry.OID.git_oid, (git_otype)GTObjectTypeAny);
130+
int gitError = git_object_lookup(&obj, indexEntry.repository.git_repository, indexEntry.OID.git_oid, (git_object_t)GTObjectTypeAny);
131131

132132
if (gitError < GIT_OK) {
133133
if (error != NULL) {

‎ObjectiveGit/GTNote.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ + (NSString *)defaultReferenceNameForRepository:(GTRepository *)repository error
9898
if (error != NULL) *error = [NSError git_errorFor:GIT_ERROR description:@"Unable to get default git notes reference name"];
9999
}
100100

101-
git_buf_free(&default_ref_name);
101+
git_buf_dispose(&default_ref_name);
102102

103103
return noteRef;
104104
}

‎ObjectiveGit/GTOID.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ + (instancetype)OIDByHashingData:(NSData *)data type:(GTObjectType)type error:(N
133133
NSParameterAssert(data != nil);
134134

135135
git_oid oid;
136-
int gitError = git_odb_hash(&oid, data.bytes, data.length, (git_otype)type);
136+
int gitError = git_odb_hash(&oid, data.bytes, data.length, (git_object_t)type);
137137
if (gitError != GIT_OK) {
138138
if (error != NULL) *error = [NSError git_errorFor:gitError description:@"Failed to hash"];
139139
return nil;

‎ObjectiveGit/GTObject.h

+8-10
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,14 @@
3131
#import "git2/types.h"
3232

3333
typedef NS_ENUM(int, GTObjectType) {
34-
GTObjectTypeAny = GIT_OBJ_ANY, /**< Object can be any of the following */
35-
GTObjectTypeBad = GIT_OBJ_BAD, /**< Object is invalid. */
36-
GTObjectTypeExt1 = GIT_OBJ__EXT1, /**< Reserved for future use. */
37-
GTObjectTypeCommit = GIT_OBJ_COMMIT, /**< A commit object. */
38-
GTObjectTypeTree = GIT_OBJ_TREE, /**< A tree (directory listing) object. */
39-
GTObjectTypeBlob = GIT_OBJ_BLOB, /**< A file revision object. */
40-
GTObjectTypeTag = GIT_OBJ_TAG, /**< An annotated tag object. */
41-
GTObjectTypeExt2 = GIT_OBJ__EXT2, /**< Reserved for future use. */
42-
GTObjectTypeOffsetDelta = GIT_OBJ_OFS_DELTA,/**< A delta, base is given by an offset. */
43-
GTObjectTypeRefDelta = GIT_OBJ_REF_DELTA, /**< A delta, base is given by object id. */
34+
GTObjectTypeAny = GIT_OBJECT_ANY, /**< Object can be any of the following */
35+
GTObjectTypeBad = GIT_OBJECT_INVALID, /**< Object is invalid. */
36+
GTObjectTypeCommit = GIT_OBJECT_COMMIT, /**< A commit object. */
37+
GTObjectTypeTree = GIT_OBJECT_TREE, /**< A tree (directory listing) object. */
38+
GTObjectTypeBlob = GIT_OBJECT_BLOB, /**< A file revision object. */
39+
GTObjectTypeTag = GIT_OBJECT_TAG, /**< An annotated tag object. */
40+
GTObjectTypeOffsetDelta = GIT_OBJECT_OFS_DELTA,/**< A delta, base is given by an offset. */
41+
GTObjectTypeRefDelta = GIT_OBJECT_REF_DELTA, /**< A delta, base is given by object id. */
4442
};
4543

4644
@class GTRepository;

‎ObjectiveGit/GTObject.m

+7-7
Original file line numberDiff line numberDiff line change
@@ -82,26 +82,26 @@ - (id)initWithObj:(git_object *)object inRepository:(GTRepository *)repo {
8282
NSAssert(object_repo == repo.git_repository, @"object %p doesn't belong to repo %@", object, repo);
8383

8484
Class objectClass = nil;
85-
git_otype t = git_object_type(object);
85+
git_object_t t = git_object_type(object);
8686
switch (t) {
87-
case GIT_OBJ_COMMIT:
87+
case GIT_OBJECT_COMMIT:
8888
objectClass = [GTCommit class];
8989
break;
90-
case GIT_OBJ_TREE:
90+
case GIT_OBJECT_TREE:
9191
objectClass = [GTTree class];
9292
break;
93-
case GIT_OBJ_BLOB:
93+
case GIT_OBJECT_BLOB:
9494
objectClass = [GTBlob class];
9595
break;
96-
case GIT_OBJ_TAG:
96+
case GIT_OBJECT_TAG:
9797
objectClass = [GTTag class];
9898
break;
9999
default:
100100
break;
101101
}
102102

103103
if (!objectClass) {
104-
NSLog(@"Unknown git_otype %s (%d)", git_object_type2string(t), (int)t);
104+
NSLog(@"Unknown git_object_t %s (%d)", git_object_type2string(t), (int)t);
105105
return nil;
106106
}
107107

@@ -149,7 +149,7 @@ - (GTOdbObject *)odbObjectWithError:(NSError **)error {
149149

150150
- (id)objectByPeelingToType:(GTObjectType)type error:(NSError **)error {
151151
git_object *peeled = NULL;
152-
int gitError = git_object_peel(&peeled, self.git_object, (git_otype)type);
152+
int gitError = git_object_peel(&peeled, self.git_object, (git_object_t)type);
153153
if (gitError != GIT_OK) {
154154
if (error != NULL) *error = [NSError git_errorFor:gitError description:@"Cannot peel object"];
155155
return nil;

‎ObjectiveGit/GTObjectDatabase.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ - (GTOID *)writeData:(NSData *)data type:(GTObjectType)type error:(NSError **)er
102102
NSParameterAssert(data != nil);
103103

104104
git_odb_stream *stream;
105-
int gitError = git_odb_open_wstream(&stream, self.git_odb, data.length, (git_otype)type);
105+
int gitError = git_odb_open_wstream(&stream, self.git_odb, data.length, (git_object_t)type);
106106
@onExit {
107107
if (stream != NULL) git_odb_stream_free(stream);
108108
};

‎ObjectiveGit/GTReference.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ typedef NS_ENUM(NSInteger, GTReferenceErrorCode) {
3434
};
3535

3636
typedef NS_OPTIONS(NSInteger, GTReferenceType) {
37-
GTReferenceTypeInvalid = GIT_REF_INVALID, /** Invalid reference */
38-
GTReferenceTypeOid = GIT_REF_OID, /** A reference which points at an object id */
39-
GTReferenceTypeSymbolic = GIT_REF_SYMBOLIC, /** A reference which points at another reference */
37+
GTReferenceTypeInvalid = GIT_REFERENCE_INVALID, /** Invalid reference */
38+
GTReferenceTypeDirect = GIT_REFERENCE_DIRECT, /** A reference which points at an object id */
39+
GTReferenceTypeSymbolic = GIT_REFERENCE_SYMBOLIC, /** A reference which points at another reference */
4040
};
4141

4242
NS_ASSUME_NONNULL_BEGIN

‎ObjectiveGit/GTReference.m

+4-4
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ @interface GTReference ()
4545
case GTReferenceTypeInvalid:
4646
return @"invalid";
4747

48-
case GTReferenceTypeOid:
48+
case GTReferenceTypeDirect:
4949
return @"direct";
5050

5151
case GTReferenceTypeSymbolic:
@@ -144,7 +144,7 @@ - (GTReferenceType)referenceType {
144144
}
145145

146146
- (id)unresolvedTarget {
147-
if (self.referenceType == GTReferenceTypeOid) {
147+
if (self.referenceType == GTReferenceTypeDirect) {
148148
const git_oid *oid = git_reference_target(self.git_reference);
149149
if (oid == NULL) return nil;
150150

@@ -160,7 +160,7 @@ - (id)unresolvedTarget {
160160

161161
- (id)resolvedTarget {
162162
git_object *obj;
163-
if (git_reference_peel(&obj, self.git_reference, GIT_OBJ_ANY) != GIT_OK) {
163+
if (git_reference_peel(&obj, self.git_reference, GIT_OBJECT_ANY) != GIT_OK) {
164164
return nil;
165165
}
166166

@@ -181,7 +181,7 @@ - (GTReference *)referenceByUpdatingTarget:(NSString *)newTarget message:(NSStri
181181

182182
int gitError;
183183
git_reference *newRef = NULL;
184-
if (git_reference_type(self.git_reference) == GIT_REF_OID) {
184+
if (git_reference_type(self.git_reference) == GIT_REFERENCE_DIRECT) {
185185
GTOID *oid = [[GTOID alloc] initWithSHA:newTarget error:error];
186186
if (oid == nil) return nil;
187187

‎ObjectiveGit/GTRepository.m

+3-3
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ + (instancetype _Nullable)cloneFromURL:(NSURL *)originURL toWorkingDirectory:(NS
317317
- (id)lookUpObjectByGitOid:(const git_oid *)oid objectType:(GTObjectType)type error:(NSError **)error {
318318
git_object *obj;
319319

320-
int gitError = git_object_lookup(&obj, self.git_repository, oid, (git_otype)type);
320+
int gitError = git_object_lookup(&obj, self.git_repository, oid, (git_object_t)type);
321321
if (gitError < GIT_OK) {
322322
if (error != NULL) {
323323
char oid_str[GIT_OID_HEXSZ+1];
@@ -683,13 +683,13 @@ - (NSString *)preparedMessageWithError:(NSError * __autoreleasing *)error {
683683
int errorCode = git_repository_message(&msg, self.git_repository);
684684
if (errorCode != GIT_OK) {
685685
setErrorFromCode(errorCode);
686-
git_buf_free(&msg);
686+
git_buf_dispose(&msg);
687687
return nil;
688688
}
689689

690690
NSString *message = [[NSString alloc] initWithBytes:msg.ptr length:msg.size encoding:NSUTF8StringEncoding];
691691

692-
git_buf_free(&msg);
692+
git_buf_dispose(&msg);
693693

694694
return message;
695695
}

‎ObjectiveGit/GTTreeBuilder.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ - (GTTree *)writeTree:(NSError **)error {
155155
}
156156

157157
git_object *object = NULL;
158-
status = git_object_lookup(&object, self.repository.git_repository, &treeOid, GIT_OBJ_TREE);
158+
status = git_object_lookup(&object, self.repository.git_repository, &treeOid, GIT_OBJECT_TREE);
159159
if (status != GIT_OK) {
160160
if (error != NULL) *error = [NSError git_errorFor:status description:@"Failed to lookup tree in repository."];
161161
return nil;

‎ObjectiveGitTests/GTReferenceSpec.m

+3-3
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@
135135
expect(ref).notTo(beNil());
136136
expect(error).to(beNil());
137137

138-
expectValidReference(ref, @"36060c58702ed4c2a40832c51758d5344201d89a", GTReferenceTypeOid, @"refs/heads/master");
138+
expectValidReference(ref, @"36060c58702ed4c2a40832c51758d5344201d89a", GTReferenceTypeDirect, @"refs/heads/master");
139139
});
140140

141141
it(@"should return a valid reference to a tag", ^{
@@ -144,7 +144,7 @@
144144
expect(ref).notTo(beNil());
145145
expect(error).to(beNil());
146146

147-
expectValidReference(ref, @"5b5b025afb0b4c913b4c338a42934a3863bf3644", GTReferenceTypeOid, @"refs/tags/v0.9");
147+
expectValidReference(ref, @"5b5b025afb0b4c913b4c338a42934a3863bf3644", GTReferenceTypeDirect, @"refs/tags/v0.9");
148148
});
149149
});
150150

@@ -170,7 +170,7 @@
170170
expect(error).to(beNil());
171171
expect(ref).notTo(beNil());
172172

173-
expectValidReference(ref, @"36060c58702ed4c2a40832c51758d5344201d89a", GTReferenceTypeOid, @"refs/heads/unit_test");
173+
expectValidReference(ref, @"36060c58702ed4c2a40832c51758d5344201d89a", GTReferenceTypeDirect, @"refs/heads/unit_test");
174174
});
175175
});
176176

‎ObjectiveGitTests/GTRepositorySpec.m

+3-3
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
expect(head).notTo(beNil());
115115
expect(error).to(beNil());
116116
expect(head.targetOID.SHA).to(equal(@"36060c58702ed4c2a40832c51758d5344201d89a"));
117-
expect(@(head.referenceType)).to(equal(@(GTReferenceTypeOid)));
117+
expect(@(head.referenceType)).to(equal(@(GTReferenceTypeDirect)));
118118
});
119119

120120
it(@"should handle bare clones", ^{
@@ -139,7 +139,7 @@
139139
expect(head).notTo(beNil());
140140
expect(error).to(beNil());
141141
expect(head.targetOID.SHA).to(equal(@"36060c58702ed4c2a40832c51758d5344201d89a"));
142-
expect(@(head.referenceType)).to(equal(@(GTReferenceTypeOid)));
142+
expect(@(head.referenceType)).to(equal(@(GTReferenceTypeDirect)));
143143
});
144144

145145
it(@"should have set a valid remote URL", ^{
@@ -212,7 +212,7 @@
212212
expect(head).notTo(beNil());
213213
expect(error).to(beNil());
214214
expect(head.targetOID.SHA).to(equal(@"36060c58702ed4c2a40832c51758d5344201d89a"));
215-
expect(@(head.referenceType)).to(equal(@(GTReferenceTypeOid)));
215+
expect(@(head.referenceType)).to(equal(@(GTReferenceTypeDirect)));
216216
});
217217

218218
it(@"should fail to return HEAD for an unborn repo", ^{

0 commit comments

Comments
 (0)