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 /connect.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 'connect.c')
| -rw-r--r-- | connect.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -965,7 +965,7 @@ static struct child_process *git_tcp_connect(int fd[2], char *host, int flags) static char *git_proxy_command; static int git_proxy_command_options(const char *var, const char *value, - void *cb) + const struct config_context *ctx, void *cb) { if (!strcmp(var, "core.gitproxy")) { const char *for_pos; @@ -1011,7 +1011,7 @@ static int git_proxy_command_options(const char *var, const char *value, return 0; } - return git_default_config(var, value, cb); + return git_default_config(var, value, ctx, cb); } static int git_use_proxy(const char *host) |