From 412ae1c8c799eacfdb582358ef9ca4527cd68efa Mon Sep 17 00:00:00 2001 From: Alexander Hedges Date: Sat, 8 Sep 2018 13:39:38 +0200 Subject: [PATCH 1/5] Fix bug in isValidRemoteName According to the docs git_remote_is_valid_name returns either 1 (success) or 0. --- ObjectiveGit/GTRemote.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ObjectiveGit/GTRemote.m b/ObjectiveGit/GTRemote.m index 2adee7442..03f76b7ca 100644 --- 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 From 40bde69bbcea526e7c1d48d5f1906fc3ed1927a8 Mon Sep 17 00:00:00 2001 From: Etienne Samson Date: Mon, 26 Mar 2018 22:41:35 +0200 Subject: [PATCH 2/5] Don't put the private key in the error message --- ObjectiveGit/GTCredential.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ObjectiveGit/GTCredential.m b/ObjectiveGit/GTCredential.m index beb2d8da0..0ee809b0e 100644 --- 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; } From e5bfc49e184acf96663ad85f1f5b5a4a03e06357 Mon Sep 17 00:00:00 2001 From: Etienne Samson Date: Thu, 27 Sep 2018 21:43:12 +0200 Subject: [PATCH 3/5] Do not copy script folder into built framework --- ObjectiveGitFramework.xcodeproj/project.pbxproj | 2 -- 1 file changed, 2 deletions(-) diff --git a/ObjectiveGitFramework.xcodeproj/project.pbxproj b/ObjectiveGitFramework.xcodeproj/project.pbxproj index 4894d348a..66b9339a3 100644 --- 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; }; From 2cebe9ccb7d356d992115ef3bd278d81d7f45c7d Mon Sep 17 00:00:00 2001 From: Etienne Samson Date: Sat, 27 Oct 2018 02:20:56 +0200 Subject: [PATCH 4/5] Update to OpenSSL 1.0.2p --- External/openssl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/External/openssl b/External/openssl index 3ce7bc40a..e71ebf275 160000 --- a/External/openssl +++ b/External/openssl @@ -1 +1 @@ -Subproject commit 3ce7bc40a3c48da1c96c2d04c10045bd797c6aa3 +Subproject commit e71ebf275da66dfd601c92e0e80a35114c32f6f8 From 40d78df2b750427e6b4b3812b37691136278bf23 Mon Sep 17 00:00:00 2001 From: Etienne Samson Date: Fri, 26 Oct 2018 23:20:48 +0200 Subject: [PATCH 5/5] Update libgit2 to v0.27.7 --- External/libgit2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/External/libgit2 b/External/libgit2 index 8b89f362a..f23dc5b29 160000 --- a/External/libgit2 +++ b/External/libgit2 @@ -1 +1 @@ -Subproject commit 8b89f362a34fcccdf1c6c5f3445895b71d9c6d56 +Subproject commit f23dc5b29f1394928a940d7ec447f4bfd53dad1f