Skip to content

Commit c97e29c

Browse files
author
Rob Rix
committed
Lots of libgit2 API no longer takes a signature and/or message.
1 parent 291a0a0 commit c97e29c

File tree

6 files changed

+19
-28
lines changed

6 files changed

+19
-28
lines changed

ObjectiveGit/GTReference.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828

2929
@class GTOID;
3030
@class GTReflog;
31-
@class GTSignature;
3231

3332
typedef NS_ENUM(NSInteger, GTReferenceErrorCode) {
3433
GTReferenceErrorCodeInvalidReference = -4,
@@ -89,14 +88,12 @@ typedef NS_OPTIONS(NSInteger, GTReferenceType) {
8988
/// Note that this does *not* change the receiver's target.
9089
///
9190
/// newTarget - The target for the new reference. This must not be nil.
92-
/// signature - A signature for the committer updating this ref, used for
93-
/// creating a reflog entry. This may be nil.
9491
/// message - A message to use when creating the reflog entry for this action.
9592
/// This may be nil.
9693
/// error - The error if one occurred.
9794
///
9895
/// Returns the updated reference, or nil if an error occurred.
99-
- (GTReference *)referenceByUpdatingTarget:(NSString *)newTarget committer:(GTSignature *)signature message:(NSString *)message error:(NSError **)error;
96+
- (GTReference *)referenceByUpdatingTarget:(NSString *)newTarget message:(NSString *)message error:(NSError **)error;
10097

10198
/// The name of the reference.
10299
@property (nonatomic, readonly, copy) NSString *name;

ObjectiveGit/GTReference.m

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ - (GTReference *)referenceByRenaming:(NSString *)newName error:(NSError **)error
128128
NSParameterAssert(newName != nil);
129129

130130
git_reference *newRef = NULL;
131-
int gitError = git_reference_rename(&newRef, self.git_reference, newName.UTF8String, 0, [self.repository userSignatureForNow].git_signature, NULL);
131+
int gitError = git_reference_rename(&newRef, self.git_reference, newName.UTF8String, 0, NULL);
132132
if (gitError != GIT_OK) {
133133
if (error != NULL) *error = [NSError git_errorFor:gitError description:@"Failed to rename reference %@ to %@.", self.name, newName];
134134
return nil;
@@ -173,7 +173,7 @@ - (NSString *)targetSHA {
173173
return [self.resolvedTarget SHA];
174174
}
175175

176-
- (GTReference *)referenceByUpdatingTarget:(NSString *)newTarget committer:(GTSignature *)signature message:(NSString *)message error:(NSError **)error {
176+
- (GTReference *)referenceByUpdatingTarget:(NSString *)newTarget message:(NSString *)message error:(NSError **)error {
177177
NSParameterAssert(newTarget != nil);
178178

179179
int gitError;
@@ -182,9 +182,9 @@ - (GTReference *)referenceByUpdatingTarget:(NSString *)newTarget committer:(GTSi
182182
GTOID *oid = [[GTOID alloc] initWithSHA:newTarget error:error];
183183
if (oid == nil) return nil;
184184

185-
gitError = git_reference_set_target(&newRef, self.git_reference, oid.git_oid, signature.git_signature, message.UTF8String);
185+
gitError = git_reference_set_target(&newRef, self.git_reference, oid.git_oid, message.UTF8String);
186186
} else {
187-
gitError = git_reference_symbolic_set_target(&newRef, self.git_reference, newTarget.UTF8String, signature.git_signature, message.UTF8String);
187+
gitError = git_reference_symbolic_set_target(&newRef, self.git_reference, newTarget.UTF8String, message.UTF8String);
188188
}
189189

190190
if (gitError != GIT_OK) {

ObjectiveGit/GTRepository+RemoteOperations.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ - (BOOL)fetchRemote:(GTRemote *)remote withOptions:(NSDictionary *)options error
9595
git_strarray_free(&refspecs);
9696
};
9797

98-
gitError = git_remote_fetch(remote.git_remote, &refspecs, self.userSignatureForNow.git_signature, NULL);
98+
gitError = git_remote_fetch(remote.git_remote, &refspecs, NULL);
9999
if (gitError != GIT_OK) {
100100
if (error != NULL) *error = [NSError git_errorFor:gitError description:@"Failed to fetch from remote"];
101101
return NO;
@@ -246,7 +246,7 @@ - (BOOL)pushRefspecs:(NSArray *)refspecs toRemote:(GTRemote *)remote withOptions
246246
return NO;
247247
}
248248

249-
gitError = git_remote_update_tips(remote.git_remote, self.userSignatureForNow.git_signature, NULL);
249+
gitError = git_remote_update_tips(remote.git_remote, NULL);
250250
if (gitError != GIT_OK) {
251251
if (error != NULL) *error = [NSError git_errorFor:gitError description:@"Update tips failed"];
252252
return NO;

ObjectiveGit/GTRepository+Reset.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ - (BOOL)resetToCommit:(GTCommit *)commit resetType:(GTRepositoryResetType)resetT
2020
NSParameterAssert(commit != nil);
2121

2222
git_checkout_options options = GIT_CHECKOUT_OPTIONS_INIT;
23-
int gitError = git_reset(self.git_repository, commit.git_object, (git_reset_t)resetType, &options, (git_signature *)[self userSignatureForNow].git_signature, NULL);
23+
int gitError = git_reset(self.git_repository, commit.git_object, (git_reset_t)resetType, &options);
2424
if (gitError != GIT_OK) {
2525
if (error != NULL) {
2626
*error = [NSError git_errorFor:gitError description:@"Failed to reset repository to commit %@.", commit.SHA];

ObjectiveGit/GTRepository.h

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -279,41 +279,35 @@ extern NSString * const GTRepositoryInitOptionsOriginURLString;
279279
///
280280
/// name - The full name for the new reference. This must not be nil.
281281
/// targetOID - The OID that the new ref should point to. This must not be nil.
282-
/// signature - A signature for the committer creating this ref, used for
283-
/// creating a reflog entry. This may be nil.
284282
/// message - A message to use when creating the reflog entry for this action.
285283
/// This may be nil.
286284
/// error - If not NULL, set to any error that occurs.
287285
///
288286
/// Returns the created ref, or nil if an error occurred.
289-
- (GTReference *)createReferenceNamed:(NSString *)name fromOID:(GTOID *)targetOID committer:(GTSignature *)signature message:(NSString *)message error:(NSError **)error;
287+
- (GTReference *)createReferenceNamed:(NSString *)name fromOID:(GTOID *)targetOID message:(NSString *)message error:(NSError **)error;
290288

291289
/// Creates a symbolic reference to another ref.
292290
///
293291
/// name - The full name for the new reference. This must not be nil.
294292
/// targetRef - The ref that the new ref should point to. This must not be nil.
295-
/// signature - A signature for the committer creating this ref, used for
296-
/// creating a reflog entry. This may be nil.
297293
/// message - A message to use when creating the reflog entry for this action.
298294
/// This may be nil.
299295
/// error - If not NULL, set to any error that occurs.
300296
///
301297
/// Returns the created ref, or nil if an error occurred.
302-
- (GTReference *)createReferenceNamed:(NSString *)name fromReference:(GTReference *)targetRef committer:(GTSignature *)signature message:(NSString *)message error:(NSError **)error;
298+
- (GTReference *)createReferenceNamed:(NSString *)name fromReference:(GTReference *)targetRef message:(NSString *)message error:(NSError **)error;
303299

304300
/// Create a new local branch pointing to the given OID.
305301
///
306302
/// name - The name for the new branch (e.g., `master`). This must not be
307303
/// nil.
308304
/// targetOID - The OID to create the new branch off. This must not be nil.
309-
/// signature - A signature for the committer creating this branch, used for
310-
/// creating a reflog entry. This may be nil.
311305
/// message - A message to use when creating the reflog entry for this action.
312306
/// This may be nil.
313307
/// error - If not NULL, set to any error that occurs.
314308
///
315309
/// Returns the new branch, or nil if an error occurred.
316-
- (GTBranch *)createBranchNamed:(NSString *)name fromOID:(GTOID *)targetOID committer:(GTSignature *)signature message:(NSString *)message error:(NSError **)error;
310+
- (GTBranch *)createBranchNamed:(NSString *)name fromOID:(GTOID *)targetOID message:(NSString *)message error:(NSError **)error;
317311

318312
/// Get the current branch.
319313
///

ObjectiveGit/GTRepository.m

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -493,12 +493,12 @@ - (NSUInteger)numberOfCommitsInCurrentBranch:(NSError **)error {
493493
return [currentBranch numberOfCommitsWithError:error];
494494
}
495495

496-
- (GTReference *)createReferenceNamed:(NSString *)name fromOID:(GTOID *)targetOID committer:(GTSignature *)signature message:(NSString *)message error:(NSError **)error {
496+
- (GTReference *)createReferenceNamed:(NSString *)name fromOID:(GTOID *)targetOID message:(NSString *)message error:(NSError **)error {
497497
NSParameterAssert(name != nil);
498498
NSParameterAssert(targetOID != nil);
499499

500500
git_reference *ref;
501-
int gitError = git_reference_create(&ref, self.git_repository, name.UTF8String, targetOID.git_oid, 0, signature.git_signature, message.UTF8String);
501+
int gitError = git_reference_create(&ref, self.git_repository, name.UTF8String, targetOID.git_oid, 0, message.UTF8String);
502502
if (gitError != GIT_OK) {
503503
if (error != NULL) *error = [NSError git_errorFor:gitError description:@"Failed to create direct reference to %@", targetOID];
504504
return nil;
@@ -507,13 +507,13 @@ - (GTReference *)createReferenceNamed:(NSString *)name fromOID:(GTOID *)targetOI
507507
return [[GTReference alloc] initWithGitReference:ref repository:self];
508508
}
509509

510-
- (GTReference *)createReferenceNamed:(NSString *)name fromReference:(GTReference *)targetRef committer:(GTSignature *)signature message:(NSString *)message error:(NSError **)error {
510+
- (GTReference *)createReferenceNamed:(NSString *)name fromReference:(GTReference *)targetRef message:(NSString *)message error:(NSError **)error {
511511
NSParameterAssert(name != nil);
512512
NSParameterAssert(targetRef != nil);
513513
NSParameterAssert(targetRef.name != nil);
514514

515515
git_reference *ref;
516-
int gitError = git_reference_symbolic_create(&ref, self.git_repository, name.UTF8String, targetRef.name.UTF8String, 0, signature.git_signature, message.UTF8String);
516+
int gitError = git_reference_symbolic_create(&ref, self.git_repository, name.UTF8String, targetRef.name.UTF8String, 0, message.UTF8String);
517517
if (gitError != GIT_OK) {
518518
if (error != NULL) *error = [NSError git_errorFor:gitError description:@"Failed to create symbolic reference to %@", targetRef];
519519
return nil;
@@ -522,11 +522,11 @@ - (GTReference *)createReferenceNamed:(NSString *)name fromReference:(GTReferenc
522522
return [[GTReference alloc] initWithGitReference:ref repository:self];
523523
}
524524

525-
- (GTBranch *)createBranchNamed:(NSString *)name fromOID:(GTOID *)targetOID committer:(GTSignature *)signature message:(NSString *)message error:(NSError **)error {
525+
- (GTBranch *)createBranchNamed:(NSString *)name fromOID:(GTOID *)targetOID message:(NSString *)message error:(NSError **)error {
526526
NSParameterAssert(name != nil);
527527
NSParameterAssert(targetOID != nil);
528528

529-
GTReference *newRef = [self createReferenceNamed:[GTBranch.localNamePrefix stringByAppendingString:name] fromOID:targetOID committer:signature message:message error:error];
529+
GTReference *newRef = [self createReferenceNamed:[GTBranch.localNamePrefix stringByAppendingString:name] fromOID:targetOID message:message error:error];
530530
if (newRef == nil) return nil;
531531

532532
return [GTBranch branchWithReference:newRef repository:self];
@@ -800,7 +800,7 @@ static int checkoutNotifyCallback(git_checkout_notify_t why, const char *path, c
800800
- (BOOL)moveHEADToReference:(GTReference *)reference error:(NSError **)error {
801801
NSParameterAssert(reference != nil);
802802

803-
int gitError = git_repository_set_head(self.git_repository, reference.name.UTF8String, [self userSignatureForNow].git_signature, NULL);
803+
int gitError = git_repository_set_head(self.git_repository, reference.name.UTF8String);
804804
if (gitError != GIT_OK) {
805805
if (error != NULL) *error = [NSError git_errorFor:gitError description:@"Failed to move HEAD to reference %@", reference.name];
806806
}
@@ -811,7 +811,7 @@ - (BOOL)moveHEADToReference:(GTReference *)reference error:(NSError **)error {
811811
- (BOOL)moveHEADToCommit:(GTCommit *)commit error:(NSError **)error {
812812
NSParameterAssert(commit != nil);
813813

814-
int gitError = git_repository_set_head_detached(self.git_repository, commit.OID.git_oid, [self userSignatureForNow].git_signature, NULL);
814+
int gitError = git_repository_set_head_detached(self.git_repository, commit.OID.git_oid);
815815
if (gitError != GIT_OK) {
816816
if (error != NULL) *error = [NSError git_errorFor:gitError description:@"Failed to move HEAD to commit %@", commit.SHA];
817817
}

0 commit comments

Comments
 (0)