mirror of
https://git.proxmox.com/git/libgit2
synced 2026-01-01 21:37:49 +00:00
repository: add minimal reinitialization of repository
This currently only ensures that the version of the repository format isn't greater than zero.
This commit is contained in:
parent
9b84447a80
commit
5663e61a06
@ -24,6 +24,8 @@
|
||||
|
||||
#define GIT_BRANCH_MASTER "master"
|
||||
|
||||
#define GIT_CONFIG_CORE_REPOSITORYFORMATVERSION "core.repositoryformatversion"
|
||||
#define GIT_REPOSITORYFORMATVERSION 0
|
||||
|
||||
static void drop_odb(git_repository *repo)
|
||||
{
|
||||
@ -628,12 +630,46 @@ cleanup:
|
||||
return error;
|
||||
}
|
||||
|
||||
static int repo_init_reinit(const char *repository_path, int is_bare)
|
||||
static int check_repositoryformatversion(git_repository *repo)
|
||||
{
|
||||
/* TODO: reinit the repository */
|
||||
return git__throw(GIT_ENOTIMPLEMENTED,
|
||||
"Failed to reinitialize the %srepository at '%s'. "
|
||||
"This feature is not yet implemented",
|
||||
git_config *config;
|
||||
int version, error = GIT_SUCCESS;
|
||||
|
||||
if ((error = git_repository_config(&config, repo)) < GIT_SUCCESS)
|
||||
return git__throw(error, "Failed to open config file.");
|
||||
|
||||
error = git_config_get_int32(config, GIT_CONFIG_CORE_REPOSITORYFORMATVERSION, &version);
|
||||
|
||||
if (GIT_REPOSITORYFORMATVERSION < version)
|
||||
error = git__throw(GIT_ERROR, "Unsupported git repository version (Expected version <= %d, found %d).", GIT_REPOSITORYFORMATVERSION, version);
|
||||
|
||||
git_config_free(config);
|
||||
|
||||
return error;
|
||||
}
|
||||
|
||||
static int repo_init_reinit(git_repository **repo_out, const char *repository_path, int is_bare)
|
||||
{
|
||||
int error;
|
||||
git_repository *repo = NULL;
|
||||
|
||||
if ((error = git_repository_open(&repo, repository_path)) < GIT_SUCCESS)
|
||||
goto error;
|
||||
|
||||
if ((error = check_repositoryformatversion(repo)) < GIT_SUCCESS)
|
||||
goto error;
|
||||
|
||||
/* TODO: reinitialize the templates */
|
||||
|
||||
*repo_out = repo;
|
||||
|
||||
return GIT_SUCCESS;
|
||||
|
||||
error:
|
||||
git_repository_free(repo);
|
||||
|
||||
return git__rethrow(error,
|
||||
"Failed to reinitialize the %srepository at '%s'. ",
|
||||
is_bare ? "bare " : "", repository_path);
|
||||
}
|
||||
|
||||
@ -673,7 +709,7 @@ static int repo_init_config(const char *git_dir, int is_bare)
|
||||
goto cleanup;
|
||||
|
||||
SET_REPO_CONFIG(bool, "core.bare", is_bare);
|
||||
SET_REPO_CONFIG(int32, "core.repositoryformatversion", 0);
|
||||
SET_REPO_CONFIG(int32, GIT_CONFIG_CORE_REPOSITORYFORMATVERSION, GIT_REPOSITORYFORMATVERSION);
|
||||
/* TODO: what other defaults? */
|
||||
|
||||
cleanup:
|
||||
@ -735,7 +771,7 @@ int git_repository_init(git_repository **repo_out, const char *path, unsigned is
|
||||
|
||||
if (git_path_isdir(repository_path.ptr) == GIT_SUCCESS) {
|
||||
if (quickcheck_repository_dir(&repository_path) == GIT_SUCCESS) {
|
||||
error = repo_init_reinit(repository_path.ptr, is_bare);
|
||||
error = repo_init_reinit(repo_out, repository_path.ptr, is_bare);
|
||||
git_buf_free(&repository_path);
|
||||
return error;
|
||||
}
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
#include "clar_libgit2.h"
|
||||
#include "fileops.h"
|
||||
#include "repository.h"
|
||||
#include "config.h"
|
||||
|
||||
enum repo_mode {
|
||||
STANDARD_REPOSITORY = 0,
|
||||
@ -105,3 +106,38 @@ void test_repo_init__bare_repo_escaping_current_workdir(void)
|
||||
|
||||
cleanup_repository("a");
|
||||
}
|
||||
|
||||
void test_repo_init__reinit_bare_repo(void)
|
||||
{
|
||||
cl_set_cleanup(&cleanup_repository, "reinit.git");
|
||||
|
||||
/* Initialize the repository */
|
||||
cl_git_pass(git_repository_init(&_repo, "reinit.git", 1));
|
||||
git_repository_free(_repo);
|
||||
|
||||
/* Reinitialize the repository */
|
||||
cl_git_pass(git_repository_init(&_repo, "reinit.git", 1));
|
||||
}
|
||||
|
||||
void test_repo_init__reinit_too_recent_bare_repo(void)
|
||||
{
|
||||
git_config *config;
|
||||
|
||||
/* Initialize the repository */
|
||||
cl_git_pass(git_repository_init(&_repo, "reinit.git", 1));
|
||||
git_repository_config(&config, _repo);
|
||||
|
||||
/*
|
||||
* Hack the config of the repository to make it look like it has
|
||||
* been created by a recenter version of git/libgit2
|
||||
*/
|
||||
cl_git_pass(git_config_set_int32(config, "core.repositoryformatversion", 42));
|
||||
|
||||
git_config_free(config);
|
||||
git_repository_free(_repo);
|
||||
|
||||
/* Try to reinitialize the repository */
|
||||
cl_git_fail(git_repository_init(&_repo, "reinit.git", 1));
|
||||
|
||||
cl_fixture_cleanup("reinit.git");
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user