Merge pull request libgit2#3251 from git-up/fixes

ethomson · ethomson · commit aacfd03dba68 · 2015-06-24T00:30:19.000-04:00
Fixes
diff --git 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;
 	}
 
diff --git 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"));
 }

Original file line number	Diff line number	Diff line change
`@@ -531,7 +531,7 @@ int git_repository_open_ext(`
`531`	`531`
`532`	`532`	`if (config &&`
`533`	`533`	`((error = load_config_data(repo, config)) < 0 \|\|`
`534`		`- (error = load_workdir(repo, config, &parent))) < 0)`
	`534`	`+ (error = load_workdir(repo, config, &parent)) < 0))`
`535`	`535`	`goto cleanup;`
`536`	`536`	`}`
`537`	`537`