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

Merge branch 'gc/config-context' into next

Browse Source 
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:
Junio C Hamano
2023-06-28 23:04:42 -07:00
parent adff1700c2 6e8e7981eb
commit 38632f3daf
103 changed files with 960 additions and 632 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gpg-interface.c
View File

@ -15,7 +15,8 @@
#include "wrapper.h"
#include "environment.h"
static int git_gpg_config(const char *, const char *, void *);
static int git_gpg_config(const char *, const char *,
const struct config_context *, void *);
static void gpg_interface_lazy_init(void)
{
@ -721,7 +722,9 @@ void set_signing_key(const char *key)
configured_signing_key = xstrdup(key);
}
static int git_gpg_config(const char *var, const char *value, void *cb UNUSED)
static int git_gpg_config(const char *var, const char *value,
const struct config_context *ctx UNUSED,
void *cb UNUSED)
{
struct gpg_format *fmt = NULL;
char *fmtname = NULL;