proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-08-14 07:27:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

repository: check the format version

Browse Source 
This is something we do on re-init but not when opening a
repository. This hasn't particularly mattered up to now as the version
has been 0 ever since the first release of git, but the times, they're
a-changing and we will soon see version 1 in the wild. We need to make
sure we don't open those.
This commit is contained in:
Carlos Martín Nieto 2015-06-23 20:44:27 +02:00
parent 99e11cdd02
commit 16c73d3804
2 changed files with 43 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/repository.c
View File

@ -32,6 +32,8 @@
# include "win32/w32_util.h" # include "win32/w32_util.h"
#endif #endif
static int check_repositoryformatversion(git_config *config);
#define GIT_FILE_CONTENT_PREFIX "gitdir:" #define GIT_FILE_CONTENT_PREFIX "gitdir:"
#define GIT_BRANCH_MASTER "master" #define GIT_BRANCH_MASTER "master"
@ -489,6 +491,7 @@ int git_repository_open_ext(
git_buf path = GIT_BUF_INIT, parent = GIT_BUF_INIT, git_buf path = GIT_BUF_INIT, parent = GIT_BUF_INIT,
link_path = GIT_BUF_INIT; link_path = GIT_BUF_INIT;
git_repository *repo; git_repository *repo;
git_config *config = NULL;
if (repo_ptr) if (repo_ptr)
*repo_ptr = NULL; *repo_ptr = NULL;
@ -510,22 +513,36 @@ int git_repository_open_ext(
GITERR_CHECK_ALLOC(repo->path_gitlink); GITERR_CHECK_ALLOC(repo->path_gitlink);
} }
/*
* We'd like to have the config, but git doesn't particularly
* care if it's not there, so we need to deal with that.
*/
error = git_repository_config_snapshot(&config, repo);
if (error < 0 && error != GIT_ENOTFOUND)
goto cleanup;
if (config && (error = check_repositoryformatversion(config)) < 0)
goto cleanup;
if ((flags & GIT_REPOSITORY_OPEN_BARE) != 0) if ((flags & GIT_REPOSITORY_OPEN_BARE) != 0)
repo->is_bare = 1; repo->is_bare = 1;
else { else {
git_config *config = NULL;
if ((error = git_repository_config_snapshot(&config, repo)) < 0 || if (config &&
(error = load_config_data(repo, config)) < 0 || ((error = load_config_data(repo, config)) < 0 ||
(error = load_workdir(repo, config, &parent)) < 0) (error = load_workdir(repo, config, &parent))) < 0)
git_repository_free(repo); goto cleanup;
git_config_free(config);
} }
if (!error) cleanup:
*repo_ptr = repo;
git_buf_free(&parent); git_buf_free(&parent);
git_config_free(config);
if (error < 0)
git_repository_free(repo);
else
*repo_ptr = repo;
return error; return error;
} }

17
tests/repo/open.c
View File

@ -20,6 +20,23 @@ void test_repo_open__bare_empty_repo(void)
cl_assert(git_repository_workdir(repo) == NULL); cl_assert(git_repository_workdir(repo) == NULL);
} }
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_config_set_int32(config, "core.repositoryformatversion", 1));
git_repository_free(repo);
cl_git_fail(git_repository_open(&repo, "empty_bare.git"));
}
void test_repo_open__standard_empty_repo_through_gitdir(void) void test_repo_open__standard_empty_repo_through_gitdir(void)
{ {
git_repository *repo; git_repository *repo;