undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

check_repository_format_gently: stop using git_config_early

Browse Source 
There's a chicken-and-egg problem with using the regular
git_config during the repository setup process. We get
around it here by using a special interface that lets us
specify the per-repo config, and avoid calling
git_pathdup().

But this interface doesn't actually make sense. It will look
in the system and per-user config, too; we definitely would
not want to accept a core.repositoryformatversion from
there.

The git_config_from_file interface is a better match, as it
lets us look at a single file.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2016-03-11 17:36:59 -05:00 committed by Junio C Hamano
parent ae5f67763b
commit 21627f9b6d
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
setup.c
View File

@ -409,15 +409,10 @@ static int check_repository_format_gently(const char *gitdir, int *nongit_ok)
repo_config = sb.buf; repo_config = sb.buf;
/* /*
* git_config() can't be used here because it calls git_pathdup() * Ignore return value; for historical reasons, we must treat a missing
* to get $GIT_CONFIG/config. That call will make setup_git_env() * config file as a noop (git-init relies on this).
* set git_dir to ".git".
*
* We are in gitdir setup, no git dir has been found useable yet.
* Use a gentler version of git_config() to check if this repo
* is a good one.
*/ */
git_config_early(fn, NULL, repo_config); git_config_from_file(fn, repo_config, NULL);
if (GIT_REPO_VERSION_READ < repository_format_version) { if (GIT_REPO_VERSION_READ < repository_format_version) {
if (!nongit_ok) if (!nongit_ok)
die ("Expected git repo version <= %d, found %d", die ("Expected git repo version <= %d, found %d",