From 4574f1aace4ca53ac0fc63a545383dab1a71fec9 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Thu, 28 Jun 2018 18:05:24 -0400 Subject: config: add options parameter to git_config_from_mem The underlying config parser knows how to handle a config_options struct, but git_config_from_mem() always passes NULL. Let's allow our callers to specify the options struct. We could add a "_with_options" variant, but since there are only a handful of callers, let's just update them to pass NULL. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- config.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'config.h') diff --git a/config.h b/config.h index c02809ffdc..f2063ceb86 100644 --- a/config.h +++ b/config.h @@ -68,8 +68,11 @@ extern int git_config_from_file(config_fn_t fn, const char *, void *); extern int git_config_from_file_with_options(config_fn_t fn, const char *, void *, const struct config_options *); -extern int git_config_from_mem(config_fn_t fn, const enum config_origin_type, - const char *name, const char *buf, size_t len, void *data); +extern int git_config_from_mem(config_fn_t fn, + const enum config_origin_type, + const char *name, + const char *buf, size_t len, + void *data, const struct config_options *opts); extern int git_config_from_blob_oid(config_fn_t fn, const char *name, const struct object_id *oid, void *data); extern void git_config_push_parameter(const char *text); -- cgit v1.2.3