From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 6 Jul 2023 18:54:48 +0000 (-0700)
Subject: Merge branch 'gc/config-context'
X-Git-Tag: v2.42.0-rc0~65
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b3d1c85d4833aef546f11e4d37516a1ececaefc3;p=thirdparty%2Fgit.git

Merge branch 'gc/config-context'

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
---

b3d1c85d4833aef546f11e4d37516a1ececaefc3
diff --cc gpg-interface.c
index 6a3817bbca,57c862a3a2..f7c1d385c1
--- a/gpg-interface.c
+++ b/gpg-interface.c
@@@ -13,9 -13,9 +13,10 @@@
  #include "tempfile.h"
  #include "alias.h"
  #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)
  {