Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 0.14.2 #677

Merged
merged 5 commits into from
Oct 27, 2018
Merged

Release 0.14.2 #677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
412ae1c
Fix bug in isValidRemoteName
alehed Sep 8, 2018
40bde69
Don't put the private key in the error message
tiennou Mar 26, 2018
e5bfc49
Do not copy script folder into built framework
tiennou Sep 27, 2018
2cebe9c
Update to OpenSSL 1.0.2p
tiennou Oct 27, 2018
40d78df
Update libgit2 to v0.27.7
tiennou Oct 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion External/libgit2
Open in desktop
Submodule libgit2 updated 80 files
+0 −92 .travis.yml
+140 −0 CHANGELOG.md
+4 −0 CMakeLists.txt
+3 −4 README.md
+0 −60 appveyor.yml
+94 −0 azure-pipelines.yml
+17 −0 ci/bash.yml
+30 −0 ci/build.ps1
+39 −0 ci/build.sh
+11 −17 ci/coverity.sh
+33 −0 ci/docker.yml
+22 −0 ci/nightly.yml
+17 −0 ci/powershell.yml
+13 −0 ci/setup-linux.sh
+25 −0 ci/setup-mingw.ps1
+8 −0 ci/setup-osx.sh
+72 −0 ci/test.ps1
+198 −0 ci/test.sh
+29 −0 cmake/Modules/CheckPrototypeDefinition.c.in
+96 −0 cmake/Modules/CheckPrototypeDefinition.cmake
+11 −6 cmake/Modules/FindIconv.cmake
+2 −2 include/git2/version.h
+25 −0 libgit2_clar.supp
+0 −23 script/appveyor-mingw.sh
+0 −102 script/cibuild.sh
+0 −9 script/install-deps-osx.sh
+13 −4 src/CMakeLists.txt
+1 −1 src/commit.c
+3 −1 src/commit_list.c
+1 −1 src/config.c
+13 −2 src/config_file.c
+36 −34 src/config_parse.c
+1 −1 src/diff_tform.c
+4 −3 src/index.c
+2 −2 src/odb.c
+1 −1 src/odb_pack.c
+1 −1 src/pack-objects.c
+7 −4 src/parse.c
+7 −0 src/patch_parse.c
+1 −1 src/rebase.c
+3 −3 src/remote.c
+7 −3 src/repository.c
+3 −2 src/revparse.c
+10 −4 src/revwalk.c
+5 −3 src/signature.c
+1 −1 src/streams/curl.c
+23 −8 src/submodule.c
+5 −5 src/tag.c
+3 −0 src/transports/http.c
+5 −0 src/transports/smart.c
+16 −16 src/transports/smart.h
+130 −120 src/transports/smart_pkt.c
+22 −23 src/transports/smart_protocol.c
+20 −15 src/transports/winhttp.c
+2 −2 src/tree-cache.c
+8 −6 src/tree.c
+64 −21 src/util.c
+3 −2 src/util.h
+13 −8 src/vector.c
+2 −2 src/worktree.c
+5 −9 tests/CMakeLists.txt
+15 −3 tests/buf/oom.c
+156 −51 tests/clar.c
+4 −1 tests/clar.h
+5 −4 tests/clar/print.h
+134 −0 tests/clar/summary.h
+40 −2 tests/config/include.c
+33 −0 tests/config/read.c
+46 −0 tests/core/memmem.c
+72 −33 tests/core/strtol.c
+19 −0 tests/core/vector.c
+71 −0 tests/diff/parse.c
+16 −0 tests/object/tree/update.c
+6 −0 tests/online/clone.c
+7 −3 tests/online/push.c
+1 −0 tests/resources/config/config-nosection
+ − tests/resources/testrepo2/.gitted/objects/39/6c7f1adb7925f51ba13a75f48252f44c5a14a2
+80 −0 tests/submodule/inject_option.c
+340 −0 tests/transports/smart/packet.c
+22 −2 tests/worktree/worktree.c
2 changes: 1 addition & 1 deletion External/openssl
Open in desktop
Submodule openssl updated 130 files
2 changes: 1 addition & 1 deletion ObjectiveGit/GTCredential.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion ObjectiveGit/GTRemote.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions ObjectiveGitFramework.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */; };
Expand Down Expand Up @@ -1343,7 +1342,6 @@
buildActionMask = 2147483647;
files = (
8DC2EF530486A6940098B216 /* InfoPlist.strings in Resources */,
F8D6384B207A618D00D1FD32 /* script in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down