Skip to content

Commit ceca0f5

Browse files
alehedalehed
committed
remove merge artifacts
1 parent 67da0fd commit ceca0f5

File tree

11 files changed

+24
-24
lines changed

11 files changed

+24
-24
lines changed

‎ObjectiveGit/GTEnumerator.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ NS_ASSUME_NONNULL_BEGIN
125125
/// error - If not NULL, set to any error that occurs during traversal.
126126
///
127127
/// Returns nil if an error occurs or the enumeration is done.
128-
- (nullable GTOID *)nextOIDWithSuccess:(nullable BOOL *)success error:(NSError **)error;
128+
- (GTOID * _Nullable)nextOIDWithSuccess:(BOOL * _Nullable)success error:(NSError **)error;
129129

130130
/// Gets the next commit.
131131
///

‎ObjectiveGit/GTIndex.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ NS_ASSUME_NONNULL_BEGIN
6969
/// error - If not NULL, set to any error that occurs.
7070
///
7171
/// Returns the loaded index, or nil if an error occurred.
72-
+ (nullable instancetype)indexWithFileURL:(NSURL *)fileURL repository:(GTRepository *)repository error:(NSError **)error;
72+
+ (instancetype _Nullable)indexWithFileURL:(NSURL *)fileURL repository:(GTRepository *)repository error:(NSError **)error;
7373

7474
- (instancetype)init NS_UNAVAILABLE;
7575

‎ObjectiveGit/GTIndexEntry.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ NS_ASSUME_NONNULL_BEGIN
6161
- (const git_index_entry *)git_index_entry __attribute__((objc_returns_inner_pointer));
6262

6363
/// The entry's index. This may be nil if nil is passed in to -initWithGitIndexEntry:
64-
@property (nonatomic, strong, readonly, nullable) GTIndex *index;
64+
@property (nonatomic, strong, readonly) GTIndex * _Nullable index;
6565

6666
/// The repository-relative path for the entry.
6767
@property (nonatomic, readonly, copy) NSString *path;
@@ -86,8 +86,8 @@ NS_ASSUME_NONNULL_BEGIN
8686

8787
@interface GTObject (GTIndexEntry)
8888

89-
+ (nullable instancetype)objectWithIndexEntry:(GTIndexEntry *)indexEntry error:(NSError **)error;
90-
- (nullable instancetype)initWithIndexEntry:(GTIndexEntry *)indexEntry error:(NSError **)error;
89+
+ (instancetype _Nullable)objectWithIndexEntry:(GTIndexEntry *)indexEntry error:(NSError **)error;
90+
- (instancetype _Nullable)initWithIndexEntry:(GTIndexEntry *)indexEntry error:(NSError **)error;
9191

9292
@end
9393

‎ObjectiveGit/GTNote.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ NS_ASSUME_NONNULL_BEGIN
4040
@interface GTNote : NSObject {}
4141

4242
/// The author of the note.
43-
@property (nonatomic, readonly, strong, nullable) GTSignature *author;
43+
@property (nonatomic, readonly, strong) GTSignature * _Nullable author;
4444

4545
/// The committer of the note.
46-
@property (nonatomic, readonly, strong, nullable) GTSignature *committer;
46+
@property (nonatomic, readonly, strong) GTSignature * _Nullable committer;
4747

4848
/// Content of the note.
4949
@property (nonatomic, readonly, strong) NSString *note;
@@ -62,7 +62,7 @@ NS_ASSUME_NONNULL_BEGIN
6262
/// May be NULL.
6363
///
6464
/// Returns initialized GTNote instance or nil on failure (error will be populated, if passed).
65-
- (nullable instancetype)initWithTargetOID:(GTOID *)oid repository:(GTRepository *)repository referenceName:(nullable NSString *)referenceName error:(NSError **)error;
65+
- (instancetype _Nullable)initWithTargetOID:(GTOID *)oid repository:(GTRepository *)repository referenceName:(NSString * _Nullable)referenceName error:(NSError **)error;
6666

6767
/// Create a note with target libgit2 oid in the given repository.
6868
///
@@ -71,7 +71,7 @@ NS_ASSUME_NONNULL_BEGIN
7171
/// referenceName - Name for the notes reference in the repo, or NULL for default ("refs/notes/commits")
7272
///
7373
/// Returns initialized GTNote instance or nil on failure.
74-
- (nullable instancetype)initWithTargetGitOID:(git_oid *)oid repository:(git_repository *)repository referenceName:(const char * _Nullable)referenceName error:(NSError **)error NS_DESIGNATED_INITIALIZER;
74+
- (instancetype _Nullable)initWithTargetGitOID:(git_oid *)oid repository:(git_repository *)repository referenceName:(const char * _Nullable)referenceName error:(NSError **)error NS_DESIGNATED_INITIALIZER;
7575

7676
- (instancetype)init NS_UNAVAILABLE;
7777

@@ -83,7 +83,7 @@ NS_ASSUME_NONNULL_BEGIN
8383
/// May be NULL.
8484
///
8585
/// Returns default reference name (usually "refs/notes/commits").
86-
+ (nullable NSString *)defaultReferenceNameForRepository:(GTRepository *)repository error:(NSError **)error;
86+
+ (NSString * _Nullable)defaultReferenceNameForRepository:(GTRepository *)repository error:(NSError **)error;
8787

8888
@end
8989

‎ObjectiveGit/GTOID.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ NS_ASSUME_NONNULL_BEGIN
1616
@interface GTOID : NSObject <NSCopying>
1717

1818
/// The SHA pointed to by the OID.
19-
@property (nonatomic, readonly, copy, nullable) NSString *SHA;
19+
@property (nonatomic, readonly, copy) NSString * _Nullable SHA;
2020

2121
/// Is the OID all zero? This usually indicates that the object has not been
2222
/// inserted into the ODB yet.

‎ObjectiveGit/GTReference.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ NS_ASSUME_NONNULL_BEGIN
5252
@property (nonatomic, readonly, strong) GTRepository *repository;
5353
@property (nonatomic, readonly) GTReferenceType referenceType;
5454
@property (nonatomic, readonly) const git_oid *git_oid;
55-
@property (nonatomic, strong, readonly, nullable) GTOID *OID;
55+
@property (nonatomic, strong, readonly) GTOID * _Nullable OID;
5656

5757
/// Whether this is a remote-tracking branch.
5858
@property (nonatomic, readonly, getter = isRemote) BOOL remote;
@@ -78,10 +78,10 @@ NS_ASSUME_NONNULL_BEGIN
7878
- (git_reference *)git_reference __attribute__((objc_returns_inner_pointer));
7979

8080
/// The target (either GTObject or GTReference) to which the reference points.
81-
@property (nonatomic, readonly, copy, nullable) id unresolvedTarget;
81+
@property (nonatomic, readonly, copy) id _Nullable unresolvedTarget;
8282

8383
/// The resolved object to which the reference points.
84-
@property (nonatomic, readonly, copy, nullable) id resolvedTarget;
84+
@property (nonatomic, readonly, copy) id _Nullable resolvedTarget;
8585

8686
/// The last direct reference in a chain
8787
@property (nonatomic, readonly, copy) GTReference *resolvedReference;

‎ObjectiveGit/GTReflog.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ NS_ASSUME_NONNULL_BEGIN
2626
/// reference - The reference whose reflog is being represented. Cannot be nil.
2727
///
2828
/// Returns the initialized object.
29-
- (nullable instancetype)initWithReference:(nonnull GTReference *)reference NS_DESIGNATED_INITIALIZER;
29+
- (instancetype _Nullable)initWithReference:(GTReference * _Nonnull)reference NS_DESIGNATED_INITIALIZER;
3030

3131
/// Writes a new entry to the reflog.
3232
///

‎ObjectiveGit/GTRepository+RemoteOperations.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ typedef NS_ENUM(NSInteger, GTFetchPruneOption) {
114114
///
115115
/// Returns YES if the push was successful, NO otherwise (and `error`, if provided,
116116
/// will point to an error describing what happened).
117-
- (BOOL)pushNotes:(nullable NSString *)noteReferenceName toRemote:(GTRemote *)remote withOptions:(nullable NSDictionary *)options error:(NSError **)error progress:(nullable void (^)(unsigned int current, unsigned int total, size_t bytes, BOOL *stop))progressBlock;
117+
- (BOOL)pushNotes:(NSString * _Nullable)noteReferenceName toRemote:(GTRemote *)remote withOptions:(NSDictionary * _Nullable)options error:(NSError **)error progress:(void (^ _Nullable)(unsigned int current, unsigned int total, size_t bytes, BOOL *stop))progressBlock;
118118

119119
/// Delete a remote branch
120120
///

‎ObjectiveGit/GTRepository.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ typedef NS_ENUM(NSInteger, GTRepositoryStateType) {
179179

180180
/// The file URL for the repository's working directory.
181181
/// Returns nil for a bare repository.
182-
@property (nonatomic, readonly, strong, nullable) NSURL *fileURL;
182+
@property (nonatomic, readonly, strong) NSURL * _Nullable fileURL;
183183
/// The file URL for the repository's .git directory.
184184
@property (nonatomic, readonly, strong) NSURL * _Nullable gitDirectoryURL;
185185

@@ -230,7 +230,7 @@ typedef NS_ENUM(NSInteger, GTRepositoryStateType) {
230230
/// error - The error if one occurs.
231231
///
232232
/// Returns the initialized repository, or nil if an error occurred.
233-
- (nullable instancetype)initWithURL:(NSURL *)localFileURL flags:(NSInteger)flags ceilingDirs:(nullable NSArray<NSURL *> *)ceilingDirURLs error:(NSError **)error;
233+
- (instancetype _Nullable)initWithURL:(NSURL *)localFileURL flags:(NSInteger)flags ceilingDirs:(NSArray<NSURL *> * _Nullable)ceilingDirURLs error:(NSError **)error;
234234

235235
- (instancetype)init NS_UNAVAILABLE;
236236

@@ -641,7 +641,7 @@ typedef NS_ENUM(NSInteger, GTRepositoryStateType) {
641641
/// May be NULL.
642642
///
643643
/// Returns the newly created note or nil on error.
644-
- (nullable GTNote *)createNote:(NSString *)note target:(GTObject *)theTarget referenceName:(nullable NSString *)referenceName author:(GTSignature *)author committer:(GTSignature *)committer overwriteIfExists:(BOOL)overwrite error:(NSError **)error;
644+
- (GTNote * _Nullable)createNote:(NSString *)note target:(GTObject *)theTarget referenceName:(NSString * _Nullable)referenceName author:(GTSignature *)author committer:(GTSignature *)committer overwriteIfExists:(BOOL)overwrite error:(NSError **)error;
645645

646646
/// Removes a note attached to object in this repo
647647
///
@@ -655,7 +655,7 @@ typedef NS_ENUM(NSInteger, GTRepositoryStateType) {
655655
/// May be NULL.
656656
///
657657
/// Returns the YES on success and NO on error.
658-
- (BOOL)removeNoteFromObject:(GTObject *)parentObject referenceName:(nullable NSString *)referenceName author:(GTSignature *)author committer:(GTSignature *)committer error:(NSError **)error;
658+
- (BOOL)removeNoteFromObject:(GTObject *)parentObject referenceName:(NSString * _Nullable)referenceName author:(GTSignature *)author committer:(GTSignature *)committer error:(NSError **)error;
659659

660660
/// Enumerates through all stored notes in this repo
661661
///
@@ -667,7 +667,7 @@ typedef NS_ENUM(NSInteger, GTRepositoryStateType) {
667667
/// If the block sets `stop` to YES, the iterator is finished.
668668
///
669669
/// Returns YES on overall success or NO on error of any kind.
670-
- (BOOL)enumerateNotesWithReferenceName:(nullable NSString *)referenceName error:(NSError **)error usingBlock:(void (^)(GTNote * __nullable note, GTObject * __nullable object, NSError * __nullable error, BOOL *stop))block;
670+
- (BOOL)enumerateNotesWithReferenceName:(NSString * _Nullable)referenceName error:(NSError **)error usingBlock:(void (^)(GTNote * _Nullable note, GTObject * _Nullable object, NSError * _Nullable error, BOOL *stop))block;
671671

672672
@end
673673

‎ObjectiveGit/GTSignature.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ NS_ASSUME_NONNULL_BEGIN
4242
@property (nonatomic, readonly, copy) NSString * _Nullable email;
4343

4444
/// The time when the action happened.
45-
@property (nonatomic, readonly, strong, nullable) NSDate *time;
45+
@property (nonatomic, readonly, strong) NSDate * _Nullable time;
4646

4747
/// The time zone that `time` should be interpreted relative to.
48-
@property (nonatomic, readonly, copy, nullable) NSTimeZone *timeZone;
48+
@property (nonatomic, readonly, copy) NSTimeZone * _Nullable timeZone;
4949

5050
/// Initializes the receiver with the given signature.
5151
///

‎ObjectiveGitTests/GTRepositoryStashingSpec.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@
158158
BOOL success = NO;
159159

160160
__block NSUInteger lastStashIndex = 0;
161-
[repository enumerateStashesUsingBlock:^(NSUInteger index, NSString * __nullable message, GTOID * __nullable oid, BOOL * __nonnull stop) {
161+
[repository enumerateStashesUsingBlock:^(NSUInteger index, NSString * _Nullable message, GTOID * _Nullable oid, BOOL * _Nonnull stop) {
162162
lastStashIndex = index;
163163
}];
164164

0 commit comments

Comments
 (0)