mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

config: add read_very_early_config()

Browse Source 
Created an even lighter version of read_early_config() that
only looks at system and global config settings.  It omits
repo-local, worktree-local, and command-line settings.

Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff Hostetler 2019-04-15 13:39:46 -07:00 committed by Junio C Hamano
parent a7bc01eb25
commit 800a7f99a8
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
config.c
View File

@ -1688,14 +1688,15 @@ static int do_git_config_sequence(const struct config_options *opts,
ret += git_config_from_file(fn, user_config, data); ret += git_config_from_file(fn, user_config, data);
current_parsing_scope = CONFIG_SCOPE_REPO; current_parsing_scope = CONFIG_SCOPE_REPO;
if (repo_config && !access_or_die(repo_config, R_OK, 0)) if (!opts->ignore_repo && repo_config &&
!access_or_die(repo_config, R_OK, 0))
ret += git_config_from_file(fn, repo_config, data); ret += git_config_from_file(fn, repo_config, data);
/* /*
* Note: this should have a new scope, CONFIG_SCOPE_WORKTREE. * Note: this should have a new scope, CONFIG_SCOPE_WORKTREE.
* But let's not complicate things before it's actually needed. * But let's not complicate things before it's actually needed.
*/ */
if (repository_format_worktree_config) { if (!opts->ignore_worktree && repository_format_worktree_config) {
char *path = git_pathdup("config.worktree"); char *path = git_pathdup("config.worktree");
if (!access_or_die(path, R_OK, 0)) if (!access_or_die(path, R_OK, 0))
ret += git_config_from_file(fn, path, data); ret += git_config_from_file(fn, path, data);
@ -1703,7 +1704,7 @@ static int do_git_config_sequence(const struct config_options *opts,
} }
current_parsing_scope = CONFIG_SCOPE_CMDLINE; current_parsing_scope = CONFIG_SCOPE_CMDLINE;
if (git_config_from_parameters(fn, data) < 0) if (!opts->ignore_cmdline && git_config_from_parameters(fn, data) < 0)
die(_("unable to parse command-line config")); die(_("unable to parse command-line config"));
current_parsing_scope = CONFIG_SCOPE_UNKNOWN; current_parsing_scope = CONFIG_SCOPE_UNKNOWN;
@ -1794,6 +1795,22 @@ void read_early_config(config_fn_t cb, void *data)
strbuf_release(&gitdir); strbuf_release(&gitdir);
} }
/*
* Read config but only enumerate system and global settings.
* Omit any repo-local, worktree-local, or command-line settings.
*/
void read_very_early_config(config_fn_t cb, void *data)
{
struct config_options opts = { 0 };
opts.respect_includes = 1;
opts.ignore_repo = 1;
opts.ignore_worktree = 1;
opts.ignore_cmdline = 1;
config_with_options(cb, data, NULL, &opts);
}
static struct config_set_element *configset_find_element(struct config_set *cs, const char *key) static struct config_set_element *configset_find_element(struct config_set *cs, const char *key)
{ {
struct config_set_element k; struct config_set_element k;

4
config.h
View File

@ -55,6 +55,9 @@ typedef int (*config_parser_event_fn_t)(enum config_event_t type,
struct config_options { struct config_options {
unsigned int respect_includes : 1; unsigned int respect_includes : 1;
unsigned int ignore_repo : 1;
unsigned int ignore_worktree : 1;
unsigned int ignore_cmdline : 1;
const char *commondir; const char *commondir;
const char *git_dir; const char *git_dir;
config_parser_event_fn_t event_fn; config_parser_event_fn_t event_fn;
@ -83,6 +86,7 @@ extern int git_config_from_blob_oid(config_fn_t fn, const char *name,
extern void git_config_push_parameter(const char *text); extern void git_config_push_parameter(const char *text);
extern int git_config_from_parameters(config_fn_t fn, void *data); extern int git_config_from_parameters(config_fn_t fn, void *data);
extern void read_early_config(config_fn_t cb, void *data); extern void read_early_config(config_fn_t cb, void *data);
extern void read_very_early_config(config_fn_t cb, void *data);
extern void git_config(config_fn_t fn, void *); extern void git_config(config_fn_t fn, void *);
extern int config_with_options(config_fn_t fn, void *, extern int config_with_options(config_fn_t fn, void *,
struct git_config_source *config_source, struct git_config_source *config_source,