Merge pull request #677 from tiennou/release/0.14.2

tiennou · web-flow · commit 834b3110b925 · 2018-10-27T15:41:47.000+02:00
Release 0.14.2
diff --git a/External/libgit2 b/External/libgit2
@@ -1 +1 @@
-Subproject commit 8b89f362a34fcccdf1c6c5f3445895b71d9c6d56
+Subproject commit f23dc5b29f1394928a940d7ec447f4bfd53dad1f
diff --git a/External/openssl b/External/openssl
@@ -1 +1 @@
-Subproject commit 3ce7bc40a3c48da1c96c2d04c10045bd797c6aa3
+Subproject commit e71ebf275da66dfd601c92e0e80a35114c32f6f8
diff --git a/ObjectiveGit/GTCredential.m b/ObjectiveGit/GTCredential.m
@@ -77,7 +77,7 @@ + (instancetype)credentialWithUserName:(NSString *)userName publicKeyString:(NSS
 	git_cred *cred;
 	int gitError = git_cred_ssh_key_memory_new(&cred, userName.UTF8String, publicKeyString.UTF8String, privateKeyString.UTF8String, passphrase.UTF8String);
 	if (gitError != GIT_OK) {
-		if (error) *error = [NSError git_errorFor:gitError description:@"Failed to create credentials object" failureReason:@"There was an error creating a credential object for username %@ with the provided public/private key pair.\nPublic key: %@\nPrivate key: %@", userName, publicKeyString, privateKeyString];
+		if (error) *error = [NSError git_errorFor:gitError description:@"Failed to create credentials object" failureReason:@"There was an error creating a credential object for username %@ with the provided public/private key pair.\nPublic key: %@", userName, publicKeyString];
 		return nil;
 	}
 	
diff --git a/ObjectiveGit/GTRemote.m b/ObjectiveGit/GTRemote.m
@@ -104,7 +104,7 @@ - (NSString *)description {
 + (BOOL)isValidRemoteName:(NSString *)name {
 	NSParameterAssert(name != nil);
 
-	return git_remote_is_valid_name(name.UTF8String) == GIT_OK;
+	return (git_remote_is_valid_name(name.UTF8String) == 1 ? YES : NO);
 }
 
 #pragma mark Properties
diff --git a/ObjectiveGitFramework.xcodeproj/project.pbxproj b/ObjectiveGitFramework.xcodeproj/project.pbxproj
@@ -365,7 +365,6 @@
 		F8D1BDEF1B31FE7C00CDEC90 /* GTRepository+Pull.h in Headers */ = {isa = PBXBuildFile; fileRef = F8D1BDEC1B31FE7C00CDEC90 /* GTRepository+Pull.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		F8D1BDF01B31FE7C00CDEC90 /* GTRepository+Pull.m in Sources */ = {isa = PBXBuildFile; fileRef = F8D1BDED1B31FE7C00CDEC90 /* GTRepository+Pull.m */; };
 		F8D1BDF11B31FE7C00CDEC90 /* GTRepository+Pull.m in Sources */ = {isa = PBXBuildFile; fileRef = F8D1BDED1B31FE7C00CDEC90 /* GTRepository+Pull.m */; };
-		F8D6384B207A618D00D1FD32 /* script in Resources */ = {isa = PBXBuildFile; fileRef = F8D6384A207A618D00D1FD32 /* script */; };
 		F8D6385C207AC74A00D1FD32 /* libiconv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = F8D6385B207AC74A00D1FD32 /* libiconv.tbd */; };
 		F8D6385D207AC75100D1FD32 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 23BB67BB1C7DF45300A37A66 /* libz.tbd */; };
 		F8D6385F207ACAE600D1FD32 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = F8D6385E207ACAE600D1FD32 /* libz.tbd */; };
@@ -1343,7 +1342,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				8DC2EF530486A6940098B216 /* InfoPlist.strings in Resources */,
-				F8D6384B207A618D00D1FD32 /* script in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ + (instancetype)credentialWithUserName:(NSString *)userName publicKeyString:(NSS`
`77`	`77`	`git_cred *cred;`
`78`	`78`	`int gitError = git_cred_ssh_key_memory_new(&cred, userName.UTF8String, publicKeyString.UTF8String, privateKeyString.UTF8String, passphrase.UTF8String);`
`79`	`79`	`if (gitError != GIT_OK) {`
`80`		`- if (error) *error = [NSError git_errorFor:gitError description:@"Failed to create credentials object" failureReason:@"There was an error creating a credential object for username %@ with the provided public/private key pair.\nPublic key: %@\nPrivate key: %@", userName, publicKeyString, privateKeyString];`
	`80`	`+ if (error) *error = [NSError git_errorFor:gitError description:@"Failed to create credentials object" failureReason:@"There was an error creating a credential object for username %@ with the provided public/private key pair.\nPublic key: %@", userName, publicKeyString];`
`81`	`81`	`return nil;`
`82`	`82`	`}`
`83`	`83`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ - (NSString *)description {`
`104`	`104`	`+ (BOOL)isValidRemoteName:(NSString *)name {`
`105`	`105`	`NSParameterAssert(name != nil);`
`106`	`106`
`107`		`- return git_remote_is_valid_name(name.UTF8String) == GIT_OK;`
	`107`	`+ return (git_remote_is_valid_name(name.UTF8String) == 1 ? YES : NO);`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`#pragma mark Properties`