From 8113056c7a9e3efc543e75147fe72a25405fc9f3 Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Latour Date: Tue, 23 Jun 2015 20:57:09 -0700 Subject: [PATCH 1/2] Fixed Xcode 6.1 build warnings --- tests/repo/open.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/repo/open.c b/tests/repo/open.c index 6a5ab24fb..eb459e51d 100644 --- a/tests/repo/open.c +++ b/tests/repo/open.c @@ -22,17 +22,17 @@ void test_repo_open__bare_empty_repo(void) void test_repo_open__format_version_1(void) { - git_buf path = GIT_BUF_INIT; git_repository *repo; git_config *config; repo = cl_git_sandbox_init("empty_bare.git"); cl_git_pass(git_repository_open(&repo, "empty_bare.git")); - cl_git_pass(git_repository_config__weakptr(&config, repo)); + cl_git_pass(git_repository_config(&config, repo)); cl_git_pass(git_config_set_int32(config, "core.repositoryformatversion", 1)); + git_config_free(config); git_repository_free(repo); cl_git_fail(git_repository_open(&repo, "empty_bare.git")); } From 6a8f3fa85044243d9103283a899bc8058b3149fe Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Latour Date: Tue, 23 Jun 2015 20:59:03 -0700 Subject: [PATCH 2/2] Fixed invalid error handling in git_repository_open_ext() --- src/repository.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/repository.c b/src/repository.c index b7c99ea7f..de1c0dc1f 100644 --- a/src/repository.c +++ b/src/repository.c @@ -531,7 +531,7 @@ int git_repository_open_ext( if (config && ((error = load_config_data(repo, config)) < 0 || - (error = load_workdir(repo, config, &parent))) < 0) + (error = load_workdir(repo, config, &parent)) < 0)) goto cleanup; }