Style fixes per @tiennou feedback

Author: slavikus

ObjectiveGit/GTNote.h

@@ -85,7 +85,7 @@ NS_ASSUME_NONNULL_BEGIN
 ///                 May be NULL.
 ///
 /// Returns default reference name (usually "refs/notes/commits").
-+ (NSString*)defaultReferenceNameForRepository:(GTRepository *)repository error:(NSError **)error;
++ (NSString *)defaultReferenceNameForRepository:(GTRepository *)repository error:(NSError **)error;
 
 @end
 

ObjectiveGit/GTNote.m

@@ -41,7 +41,7 @@ - (git_note *)git_note {
 	return _note;
 }
 
-- (NSString*)note {
+- (NSString *)note {
 	return @(git_note_message(self.git_note));
 }
 
@@ -53,7 +53,7 @@ - (GTSignature *)committer {
 	return [[GTSignature alloc] initWithGitSignature:git_note_committer(self.git_note)];
 }
 
-- (GTOID*)targetOID {
+- (GTOID *)targetOID {
 	return [GTOID oidWithGitOid:git_note_id(self.git_note)];
 }
 
@@ -89,8 +89,8 @@ - (instancetype)init {
 	return nil;
 }
 
-+ (NSString*)defaultReferenceNameForRepository:(GTRepository *)repository error:(NSError **)error {
-	NSString* noteRef = nil;
++ (NSString *)defaultReferenceNameForRepository:(GTRepository *)repository error:(NSError **)error {
+	NSString *noteRef = nil;
 
 	git_buf default_ref_name = { 0 };
 	int gitErr = git_note_default_ref(&default_ref_name, repository.git_repository);
@@ -104,7 +104,13 @@ + (NSString*)defaultReferenceNameForRepository:(GTRepository *)repository error:
 		return nil;
 	}
 
-	noteRef = [NSString stringWithUTF8String:default_ref_name.ptr];
+	if (default_ref_name.ptr != NULL) {
+		noteRef = @(default_ref_name.ptr);
+	} else {
+		if (error != NULL) {
+			*error = [NSError git_errorFor:GIT_ERROR description:@"Unable to get default git notes reference name"];
+		}
+	}
 
 	git_buf_free(&default_ref_name);
 

ObjectiveGit/GTRepository+RemoteOperations.h

@@ -115,7 +115,7 @@ typedef NS_ENUM(NSInteger, GTFetchPruneOption) {
 ///
 /// Returns YES if the push was successful, NO otherwise (and `error`, if provided,
 /// will point to an error describing what happened).
-- (BOOL)pushBranches:(NSArray<GTBranch *> *)branches toRemote:(GTRemote *)remote withOptions:(nullable NSDictionary *)options withNotesReferenceName:(nullable NSString*)notesReferenceName error:(NSError **)error progress:(nullable void (^)(unsigned int current, unsigned int total, size_t bytes, BOOL *stop))progressBlock;
+- (BOOL)pushBranches:(NSArray<GTBranch *> *)branches toRemote:(GTRemote *)remote withOptions:(nullable NSDictionary *)options withNotesReferenceName:(nullable NSString *)notesReferenceName error:(NSError **)error progress:(nullable void (^)(unsigned int current, unsigned int total, size_t bytes, BOOL *stop))progressBlock;
 
 /// Push a given Git notes reference name to a remote.
 ///

ObjectiveGit/GTRepository+RemoteOperations.m

@@ -178,56 +178,56 @@ - (BOOL)pushBranches:(NSArray *)branches toRemote:(GTRemote *)remote withOptions
 	return [self pushBranches:branches toRemote:remote withOptions:options withNotesReferenceName:nil error:error progress:progressBlock];
 }
 
-- (BOOL)pushBranches:(NSArray *)branches toRemote:(GTRemote *)remote withOptions:(NSDictionary *)options withNotesReferenceName:(NSString*)referenceName error:(NSError **)error progress:(GTRemotePushTransferProgressBlock)progressBlock {
+- (BOOL)pushBranches:(NSArray *)branches toRemote:(GTRemote *)remote withOptions:(NSDictionary *)options withNotesReferenceName:(NSString *)referenceName error:(NSError **)error progress:(GTRemotePushTransferProgressBlock)progressBlock {
 	NSParameterAssert(branches != nil);
 	NSParameterAssert(branches.count != 0);
 	NSParameterAssert(remote != nil);
-	
+
 	NSMutableArray *refspecs = nil;
 	// Build refspecs for the passed in branches
 	refspecs = [NSMutableArray arrayWithCapacity:branches.count];
 	for (GTBranch *branch in branches) {
 		// Default remote reference for when branch doesn't exist on remote - create with same short name
 		NSString *remoteBranchReference = [NSString stringWithFormat:@"refs/heads/%@", branch.shortName];
-		
+
 		BOOL success = NO;
 		GTBranch *trackingBranch = [branch trackingBranchWithError:error success:&success];
-		
+
 		if (success && trackingBranch != nil) {
 			// Use remote branch short name from trackingBranch, which could be different
 			// (e.g. refs/heads/master:refs/heads/my_master)
 			remoteBranchReference = [NSString stringWithFormat:@"refs/heads/%@", trackingBranch.shortName];
 		}
-		
+
 		[refspecs addObject:[NSString stringWithFormat:@"refs/heads/%@:%@", branch.shortName, remoteBranchReference]];
 	}
 
 	// Also push the notes reference, if needed.
 	if (referenceName != nil) {
 		// but check whether the reference exists for the repo, otherwise, our push will fail
-		GTReference* notesRef = [self lookUpReferenceWithName:referenceName error:nil];
-		
-		if (notesRef != nil)
+		GTReference *notesRef = [self lookUpReferenceWithName:referenceName error:nil];
+
+		if (notesRef != nil) {
 			[refspecs addObject:[NSString stringWithFormat:@"%@:%@", referenceName, referenceName]];
+		}
 	}
 
 	return [self pushRefspecs:refspecs toRemote:remote withOptions:options error:error progress:progressBlock];
 }
 
 - (BOOL)pushNotes:(NSString *)noteRef toRemote:(GTRemote *)remote withOptions:(NSDictionary *)options error:(NSError **)error progress:(GTRemotePushTransferProgressBlock)progressBlock {
 	NSParameterAssert(remote != nil);
-	
+
 	if (noteRef == nil) {
 		noteRef = [GTNote defaultReferenceNameForRepository:self error:error];
 
 		if (noteRef == nil) return NO;
 	}
-	
-	GTReference* notesReference = [self lookUpReferenceWithName:noteRef error:error];
-	
-	if (notesReference == nil)
-		return NO;	// error will be pre-filled with the lookUpReferenceWithName call
-	
+
+	GTReference *notesReference = [self lookUpReferenceWithName:noteRef error:error];
+
+	if (notesReference == nil) return NO;
+
 	return [self pushRefspecs:@[[NSString stringWithFormat:@"%@:%@", noteRef, noteRef]] toRemote:remote withOptions:options error:error progress:progressBlock];
 }
 

ObjectiveGit/GTRepository.h

@@ -621,7 +621,7 @@ typedef NS_ENUM(NSInteger, GTRepositoryStateType) {
 /// Returns the newly created note or nil on error.
 - (nullable GTNote *)createNote:(NSString *)note target:(GTObject *)theTarget referenceName:(nullable NSString *)referenceName author:(GTSignature *)author committer:(GTSignature *)committer overwriteIfExists:(BOOL)overwrite error:(NSError **)error;
 
-/// Removes a note attached to object in this repo (using a default notes reference, e.g. "refs/notes/commits")
+/// Removes a note attached to object in this repo
 ///
 /// parentObject  - Object (usually a commit) to which the note to be removed is attached to.
 ///                 This object must belong to this repository.
@@ -635,7 +635,7 @@ typedef NS_ENUM(NSInteger, GTRepositoryStateType) {
 /// Returns the YES on success and NO on error.
 - (BOOL)removeNoteFromObject:(GTObject *)parentObject referenceName:(nullable NSString *)referenceName author:(GTSignature *)author committer:(GTSignature *)committer error:(NSError **)error;
 
-/// Enumerates through all stored notes in this repo (using a default notes reference, e.g. "refs/notes/commits")
+/// Enumerates through all stored notes in this repo
 ///
 /// referenceName - Name for the notes reference in the repo, or nil for default ("refs/notes/commits")
 /// error         - Will be filled with a NSError object in case of error.