diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-07-06 11:54:48 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-07-06 11:54:48 -0700 |
| commit | b3d1c85d4833aef546f11e4d37516a1ececaefc3 (patch) | |
| tree | b5e799c3279f98f5172ce18cfd0e9b317e9822dd /trace2/tr2_tgt_normal.c | |
| parent | Merge branch 'jc/doc-hash-object-types' (diff) | |
| parent | config: pass source to config_parser_event_fn_t (diff) | |
| download | git-b3d1c85d4833aef546f11e4d37516a1ececaefc3.tar.gz git-b3d1c85d4833aef546f11e4d37516a1ececaefc3.zip | |
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
Diffstat (limited to 'trace2/tr2_tgt_normal.c')
| -rw-r--r-- | trace2/tr2_tgt_normal.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/trace2/tr2_tgt_normal.c b/trace2/tr2_tgt_normal.c index 1ebfb464d5..d25ea13164 100644 --- a/trace2/tr2_tgt_normal.c +++ b/trace2/tr2_tgt_normal.c @@ -297,10 +297,10 @@ static void fn_exec_result_fl(const char *file, int line, } static void fn_param_fl(const char *file, int line, const char *param, - const char *value) + const char *value, const struct key_value_info *kvi) { struct strbuf buf_payload = STRBUF_INIT; - enum config_scope scope = current_config_scope(); + enum config_scope scope = kvi->scope; const char *scope_name = config_scope_name(scope); strbuf_addf(&buf_payload, "def_param scope:%s %s=%s", scope_name, param, |