diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-07-06 18:54:48 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-07-06 18:54:48 (GMT) |
| commit | b3d1c85d4833aef546f11e4d37516a1ececaefc3 (patch) | |
| tree | b5e799c3279f98f5172ce18cfd0e9b317e9822dd /builtin/repack.c | |
| parent | 1d76e69212102c3373b552186590b76d6ad8d84c (diff) | |
| parent | 6e8e7981eb86e2c19401825dbdb55d5860d11313 (diff) | |
| download | git-b3d1c85d4833aef546f11e4d37516a1ececaefc3.zip git-b3d1c85d4833aef546f11e4d37516a1ececaefc3.tar.gz git-b3d1c85d4833aef546f11e4d37516a1ececaefc3.tar.bz2 | |
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/repack.c')
| -rw-r--r-- | builtin/repack.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/builtin/repack.c b/builtin/repack.c index a96e1c2..51698e3 100644 --- a/builtin/repack.c +++ b/builtin/repack.c @@ -60,7 +60,8 @@ struct pack_objects_args { int local; }; -static int repack_config(const char *var, const char *value, void *cb) +static int repack_config(const char *var, const char *value, + const struct config_context *ctx, void *cb) { struct pack_objects_args *cruft_po_args = cb; if (!strcmp(var, "repack.usedeltabaseoffset")) { @@ -92,7 +93,7 @@ static int repack_config(const char *var, const char *value, void *cb) return git_config_string(&cruft_po_args->depth, var, value); if (!strcmp(var, "repack.cruftthreads")) return git_config_string(&cruft_po_args->threads, var, value); - return git_default_config(var, value, cb); + return git_default_config(var, value, ctx, cb); } /* |