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

diff --cc archive-tar.c
Simple merge

diff --cc archive-zip.c
Simple merge

diff --cc builtin/add.c
Simple merge

diff --cc builtin/blame.c
Simple merge

diff --cc builtin/branch.c
Simple merge

diff --cc builtin/cat-file.c
Simple merge

diff --cc builtin/checkout.c
Simple merge

diff --cc builtin/clean.c
Simple merge

diff --cc builtin/clone.c
Simple merge

diff --cc builtin/column.c
Simple merge

diff --cc builtin/commit-graph.c
Simple merge

diff --cc builtin/commit.c
Simple merge

diff --cc builtin/config.c
Simple merge

diff --cc builtin/difftool.c
Simple merge

diff --cc builtin/fetch.c
Simple merge

diff --cc builtin/fsmonitor--daemon.c
Simple merge

diff --cc builtin/grep.c
Simple merge

diff --cc builtin/help.c
Simple merge

diff --cc builtin/index-pack.c
Simple merge

diff --cc builtin/log.c
Simple merge

diff --cc builtin/merge.c
Simple merge

diff --cc builtin/multi-pack-index.c
Simple merge

diff --cc builtin/pack-objects.c
Simple merge

diff --cc builtin/patch-id.c
Simple merge

diff --cc builtin/pull.c
Simple merge

diff --cc builtin/push.c
Simple merge

diff --cc builtin/read-tree.c
Simple merge

diff --cc builtin/rebase.c
Simple merge

diff --cc builtin/receive-pack.c
Simple merge

diff --cc builtin/reflog.c
Simple merge

diff --cc builtin/remote.c
Simple merge

diff --cc builtin/repack.c
Simple merge

diff --cc builtin/reset.c
Simple merge

diff --cc builtin/show-branch.c
Simple merge

diff --cc builtin/stash.c
Simple merge

diff --cc builtin/submodule--helper.c
Simple merge

diff --cc builtin/tag.c
Simple merge

diff --cc builtin/var.c
Simple merge

diff --cc builtin/worktree.c
Simple merge

diff --cc bundle-uri.c
Simple merge

diff --cc compat/mingw.c
Simple merge

diff --cc config.c
Simple merge

diff --cc connect.c
Simple merge

diff --cc convert.c
Simple merge

diff --cc diff.c
Simple merge

diff --cc diff.h
Simple merge

diff --cc fetch-pack.c
Simple merge

diff --cc fmt-merge-msg.c
Simple merge

diff --cc fsck.c
Simple merge

diff --cc git-compat-util.h
Simple merge

diff --cc gpg-interface.c
index 6a3817bbca554fcbc25ec30826055a684b3b45a6,57c862a3a22313caa84b80ffbdef24cdd4e41fb3..f7c1d385c1f6ec068da2886395aba78d8d8a8e5b
--- 1/gpg-interface.c
--- 2/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)
  {

diff --cc grep.c
Simple merge

diff --cc http.c
Simple merge

diff --cc merge-ll.c
Simple merge

diff --cc notes.c
Simple merge

diff --cc pretty.c
Simple merge

diff --cc promisor-remote.c
Simple merge

diff --cc remote.c
Simple merge

diff --cc revision.c
Simple merge

diff --cc sequencer.c
Simple merge

diff --cc setup.c
Simple merge

diff --cc submodule-config.c
Simple merge

diff --cc trace2/tr2_cfg.c
Simple merge

diff --cc upload-pack.c
Simple merge

diff --cc worktree.c
Simple merge

diff --cc xdiff-interface.c
Simple merge