]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'gc/config-context'
authorJunio C Hamano <gitster@pobox.com>
Thu, 6 Jul 2023 18:54:48 +0000 (11:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 6 Jul 2023 18:54:48 +0000 (11:54 -0700)
commitb3d1c85d4833aef546f11e4d37516a1ececaefc3
treeb5e799c3279f98f5172ce18cfd0e9b317e9822dd
parent1d76e69212102c3373b552186590b76d6ad8d84c
parent6e8e7981eb86e2c19401825dbdb55d5860d11313
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
66 files changed:
archive-tar.c
archive-zip.c
builtin/add.c
builtin/blame.c
builtin/branch.c
builtin/cat-file.c
builtin/checkout.c
builtin/clean.c
builtin/clone.c
builtin/column.c
builtin/commit-graph.c
builtin/commit.c
builtin/config.c
builtin/difftool.c
builtin/fetch.c
builtin/fsmonitor--daemon.c
builtin/grep.c
builtin/help.c
builtin/index-pack.c
builtin/log.c
builtin/merge.c
builtin/multi-pack-index.c
builtin/pack-objects.c
builtin/patch-id.c
builtin/pull.c
builtin/push.c
builtin/read-tree.c
builtin/rebase.c
builtin/receive-pack.c
builtin/reflog.c
builtin/remote.c
builtin/repack.c
builtin/reset.c
builtin/show-branch.c
builtin/stash.c
builtin/submodule--helper.c
builtin/tag.c
builtin/var.c
builtin/worktree.c
bundle-uri.c
compat/mingw.c
config.c
connect.c
convert.c
diff.c
diff.h
fetch-pack.c
fmt-merge-msg.c
fsck.c
git-compat-util.h
gpg-interface.c
grep.c
http.c
merge-ll.c
notes.c
pretty.c
promisor-remote.c
remote.c
revision.c
sequencer.c
setup.c
submodule-config.c
trace2/tr2_cfg.c
upload-pack.c
worktree.c
xdiff-interface.c