Merge remote-tracking branch 'upstream/master' into git-notes

Author: slavikus

ObjectiveGit/GTCredential.h

@@ -46,7 +46,7 @@ NS_ASSUME_NONNULL_BEGIN
 /// type     - the credential types allowed by the operation.
 /// URL      - the URL the operation is authenticating against.
 /// userName - the user name provided by the operation. Can be nil, and might be ignored.
-- (GTCredential * _Nullable)credentialForType:(GTCredentialType)type URL:(NSString *)URL userName:(nullable NSString *)userName;
+- (GTCredential * _Nullable)credentialForType:(GTCredentialType)type URL:(nullable NSString *)URL userName:(nullable NSString *)userName;
 @end
 
 /// The GTCredential class is used to provide authentication data.

ObjectiveGit/GTOID.m

@@ -27,13 +27,11 @@ - (const git_oid *)git_oid {
 }
 
 - (NSString *)SHA {
-	char *SHA = malloc(GIT_OID_HEXSZ);
-	if (SHA == NULL) return nil;
-
-	git_oid_fmt(SHA, self.git_oid);
-
-	NSString *str = [[NSString alloc] initWithBytesNoCopy:SHA length:GIT_OID_HEXSZ encoding:NSUTF8StringEncoding freeWhenDone:YES];
-	if (str == nil) free(SHA);
+	char *SHA = git_oid_tostr_s(self.git_oid);
+	NSString *str = [[NSString alloc] initWithBytes:SHA
+                                             length:GIT_OID_HEXSZ
+                                           encoding:NSUTF8StringEncoding];
+	NSAssert(str != nil, @"Failed to create SHA string");
 	return str;
 }
 

ObjectiveGit/GTRepository.h

@@ -178,6 +178,7 @@ typedef NS_ENUM(NSInteger, GTRepositoryStateType) {
 @interface GTRepository : NSObject
 
 /// The file URL for the repository's working directory.
+/// Returns nil for a bare repository.
 @property (nonatomic, readonly, strong, nullable) NSURL *fileURL;
 /// The file URL for the repository's .git directory.
 @property (nonatomic, readonly, strong, nullable) NSURL *gitDirectoryURL;