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 --- submodule-config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'submodule-config.c') diff --git a/submodule-config.c b/submodule-config.c index 388ef1f892..2ca3272dd1 100644 --- a/submodule-config.c +++ b/submodule-config.c @@ -561,7 +561,7 @@ static const struct submodule *config_from(struct submodule_cache *cache, parameter.gitmodules_oid = &oid; parameter.overwrite = 0; git_config_from_mem(parse_config, CONFIG_ORIGIN_SUBMODULE_BLOB, rev.buf, - config, config_size, ¶meter); + config, config_size, ¶meter, NULL); strbuf_release(&rev); free(config); -- cgit v1.3-5-g45d5