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 /builtin/send-pack.c | |
| parent | 1d76e69212102c3373b552186590b76d6ad8d84c (diff) | |
| parent | 6e8e7981eb86e2c19401825dbdb55d5860d11313 (diff) | |
| download | git-b3d1c85d4833aef546f11e4d37516a1ececaefc3.tar.gz | |
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 'builtin/send-pack.c')
| -rw-r--r-- | builtin/send-pack.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/builtin/send-pack.c b/builtin/send-pack.c index 4784143004..cd6d9e4112 100644 --- a/builtin/send-pack.c +++ b/builtin/send-pack.c @@ -131,7 +131,8 @@ static void print_helper_status(struct ref *ref) strbuf_release(&buf); } -static int send_pack_config(const char *k, const char *v, void *cb) +static int send_pack_config(const char *k, const char *v, + const struct config_context *ctx, void *cb) { if (!strcmp(k, "push.gpgsign")) { const char *value; @@ -151,7 +152,7 @@ static int send_pack_config(const char *k, const char *v, void *cb) } } } - return git_default_config(k, v, cb); + return git_default_config(k, v, ctx, cb); } int cmd_send_pack(int argc, const char **argv, const char *prefix) |