Merge branch 'gc/config-context' into next
Reduce reliance on a global state in the config reading API. * gc/config-context: config: pass source to config_parser_event_fn_t config: add kvi.path, use it to evaluate includes config.c: remove config_reader from configsets config: pass kvi to die_bad_number() trace2: plumb config kvi config.c: pass ctx with CLI config config: pass ctx with config files config.c: pass ctx in configsets config: add ctx arg to config_fn_t urlmatch.h: use config_fn_t type config: inline git_color_default_config
This commit is contained in:
@ -199,13 +199,14 @@ static const struct git_var *get_git_var(const char *var)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static int show_config(const char *var, const char *value, void *cb)
|
||||
static int show_config(const char *var, const char *value,
|
||||
const struct config_context *ctx, void *cb)
|
||||
{
|
||||
if (value)
|
||||
printf("%s=%s\n", var, value);
|
||||
else
|
||||
printf("%s\n", var);
|
||||
return git_default_config(var, value, cb);
|
||||
return git_default_config(var, value, ctx, cb);
|
||||
}
|
||||
|
||||
int cmd_var(int argc, const char **argv, const char *prefix UNUSED)
|
||||
|
Reference in New Issue
Block a user