Skip to content

Commit 1279d2f

Browse files
committed
change the ones I missed
1 parent 7de377e commit 1279d2f

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

ObjectiveGit/GTCheckoutOptions.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ typedef NS_OPTIONS(NSInteger, GTCheckoutNotifyFlags) {
6464
/// @param notifyBlock A block that will be called for each event, @see `notifyFlags`.
6565
///
6666
/// @return A newly-initialized GTCheckoutOptions object.
67-
+ (instancetype)checkoutOptionsWithStrategy:(GTCheckoutStrategyType)strategy notifyFlags:(GTCheckoutNotifyFlags)notifyFlags progressBlock:(nullable void (^)(NSString *path, NSUInteger completedSteps, NSUInteger totalSteps))progressBlock notifyBlock:(nullable int (^)(GTCheckoutNotifyFlags why, NSString *path, GTDiffFile *baseline, GTDiffFile *target, GTDiffFile *workdir))notifyBlock;
67+
+ (instancetype)checkoutOptionsWithStrategy:(GTCheckoutStrategyType)strategy notifyFlags:(GTCheckoutNotifyFlags)notifyFlags progressBlock:(void (^ _Nullable)(NSString *path, NSUInteger completedSteps, NSUInteger totalSteps))progressBlock notifyBlock:(int (^ _Nullable)(GTCheckoutNotifyFlags why, NSString *path, GTDiffFile *baseline, GTDiffFile *target, GTDiffFile *workdir))notifyBlock;
6868

6969
/// Create a checkout options object.
7070
/// @see +checkoutOptionsWithStrategy:notifyFlags:progressBlock:notifyBlock:

ObjectiveGit/GTCheckoutOptions.m

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
typedef void (^GTCheckoutProgressBlock)(NSString *path, NSUInteger completedSteps, NSUInteger totalSteps);
1717

1818
// The type of block set in notifyBlock for notification reporting
19-
typedef int (^GTCheckoutNotifyBlock)(GTCheckoutNotifyFlags why, NSString *path, GTDiffFile * __nullable baseline, GTDiffFile * __nullable target, GTDiffFile * __nullable workdir);
19+
typedef int (^GTCheckoutNotifyBlock)(GTCheckoutNotifyFlags why, NSString *path, GTDiffFile * _Nullable baseline, GTDiffFile * _Nullable target, GTDiffFile * _Nullable workdir);
2020

2121

2222
@interface GTCheckoutOptions () {
@@ -26,7 +26,7 @@ @interface GTCheckoutOptions () {
2626

2727
@implementation GTCheckoutOptions
2828

29-
+ (instancetype)checkoutOptionsWithStrategy:(GTCheckoutStrategyType)strategy notifyFlags:(GTCheckoutNotifyFlags)notifyFlags progressBlock:(nullable GTCheckoutProgressBlock)progressBlock notifyBlock:(nullable GTCheckoutNotifyBlock)notifyBlock {
29+
+ (instancetype)checkoutOptionsWithStrategy:(GTCheckoutStrategyType)strategy notifyFlags:(GTCheckoutNotifyFlags)notifyFlags progressBlock:(GTCheckoutProgressBlock _Nullable)progressBlock notifyBlock:( GTCheckoutNotifyBlock _Nullable)notifyBlock {
3030
GTCheckoutOptions *options = [self checkoutOptionsWithStrategy:strategy];
3131
options.notifyFlags = notifyFlags;
3232
options.notifyBlock = notifyBlock;

ObjectiveGit/GTRepository.m

+3-3
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ static int remoteCreate(git_remote **remote, git_repository *repo, const char *n
242242
git_remote_callbacks remoteCallbacks;
243243
};
244244

245-
+ (instancetype _Nullable)cloneFromURL:(NSURL *)originURL toWorkingDirectory:(NSURL *)workdirURL options:(nullable NSDictionary *)options error:(NSError **)error transferProgressBlock:(void (^ _Nullable)(const git_transfer_progress *, BOOL *stop))transferProgressBlock {
245+
+ (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 {
246246

247247
git_clone_options cloneOptions = GIT_CLONE_OPTIONS_INIT;
248248

@@ -815,7 +815,7 @@ - (BOOL)moveHEADToCommit:(GTCommit *)commit error:(NSError **)error {
815815
return gitError == GIT_OK;
816816
}
817817

818-
- (BOOL)performCheckout:(GTObject *)target options:(nullable GTCheckoutOptions *)options error:(NSError **)error {
818+
- (BOOL)performCheckout:(GTObject *)target options:(GTCheckoutOptions * _Nullable)options error:(NSError **)error {
819819
int gitError = git_checkout_tree(self.git_repository, target.git_object, options.git_checkoutOptions);
820820
if (gitError < GIT_OK) {
821821
if (error != NULL) *error = [NSError git_errorFor:gitError description:@"Failed to checkout tree."];
@@ -838,7 +838,7 @@ - (BOOL)checkoutReference:(GTReference *)targetReference options:(GTCheckoutOpti
838838
return [self moveHEADToReference:targetReference error:error];
839839
}
840840

841-
- (BOOL)checkoutTree:(GTTree *)targetTree options:(nullable GTCheckoutOptions *)options error:(NSError **)error {
841+
- (BOOL)checkoutTree:(GTTree *)targetTree options:(GTCheckoutOptions * _Nullable)options error:(NSError **)error {
842842
return [self performCheckout:targetTree options:options error:error];
843843
}
844844

0 commit comments

Comments
 (0)