Merge pull request #3251 from git-up/fixes

Fixes
This commit is contained in:
Edward Thomson 2015-06-24 00:30:19 -04:00
commit aacfd03dba
2 changed files with 3 additions and 3 deletions

View File

@ -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;
}

View File

@ -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"));
}