Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Check the repository version #3249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 24, 2015
Merged

Check the repository version #3249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99e11cd
repository: don't error out if there is no version
carlosmn Jun 23, 2015
16c73d3
repository: check the format version
carlosmn Jun 23, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 33 additions & 11 deletions src/repository.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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;
Expand All @@ -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)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Misplaced parenthesis here: see #3251

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;
}
Expand Down Expand Up @@ -931,9 +948,14 @@ bool git_repository__reserved_names(

static int check_repositoryformatversion(git_config *config)
{
int version;
int version, error;

if (git_config_get_int32(&version, config, "core.repositoryformatversion") < 0)
error = git_config_get_int32(&version, config, "core.repositoryformatversion");
/* git ignores this if the config variable isn't there */
if (error == GIT_ENOTFOUND)
return 0;

if (error < 0)
return -1;

if (GIT_REPO_VERSION < version) {
Expand Down
17 changes: 17 additions & 0 deletions tests/repo/open.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down