diff options
author | Carlos Martín Nieto <cmn@dwim.me> | 2015-06-23 20:44:27 +0200 |
---|---|---|
committer | Carlos Martín Nieto <cmn@dwim.me> | 2015-06-23 20:44:27 +0200 |
commit | 16c73d3804407e338c7f88d5a076e3eb9786fe56 (patch) | |
tree | 261241105f734476b8161ba11af92a59bbc8bc3e | |
parent | 99e11cdd0231ec84ac0d0fc476803f067da97a34 (diff) | |
download | libgit2-cmn/repo-version-check.tar.gz |
repository: check the format versioncmn/repo-version-check
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.
-rw-r--r-- | src/repository.c | 35 | ||||
-rw-r--r-- | tests/repo/open.c | 17 |
2 files changed, 43 insertions, 9 deletions
diff --git a/src/repository.c b/src/repository.c index 49778d175..b7c99ea7f 100644 --- a/src/repository.c +++ b/src/repository.c @@ -32,6 +32,8 @@ # include "win32/w32_util.h" #endif +static int check_repositoryformatversion(git_config *config); + #define GIT_FILE_CONTENT_PREFIX "gitdir:" #define GIT_BRANCH_MASTER "master" @@ -489,6 +491,7 @@ int git_repository_open_ext( git_buf path = GIT_BUF_INIT, parent = GIT_BUF_INIT, link_path = GIT_BUF_INIT; git_repository *repo; + git_config *config = NULL; if (repo_ptr) *repo_ptr = NULL; @@ -510,22 +513,36 @@ int git_repository_open_ext( 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) repo->is_bare = 1; else { - git_config *config = NULL; - - if ((error = git_repository_config_snapshot(&config, repo)) < 0 || - (error = load_config_data(repo, config)) < 0 || - (error = load_workdir(repo, config, &parent)) < 0) - git_repository_free(repo); - git_config_free(config); + if (config && + ((error = load_config_data(repo, config)) < 0 || + (error = load_workdir(repo, config, &parent))) < 0) + goto cleanup; } - if (!error) - *repo_ptr = repo; +cleanup: git_buf_free(&parent); + git_config_free(config); + + if (error < 0) + git_repository_free(repo); + else + *repo_ptr = repo; return error; } diff --git a/tests/repo/open.c b/tests/repo/open.c index 637c785d5..6a5ab24fb 100644 --- a/tests/repo/open.c +++ b/tests/repo/open.c @@ -20,6 +20,23 @@ void test_repo_open__bare_empty_repo(void) 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) { git_repository *repo; |