diff options
| author | Jeff King <peff@peff.net> | 2018-06-28 18:05:24 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-07-03 09:36:06 -0700 |
| commit | 4574f1aace4ca53ac0fc63a545383dab1a71fec9 (patch) | |
| tree | b511f639027fe89aecc1558da227d85fcf6f69ba /submodule-config.c | |
| parent | 63583203df51c645aa2bf2988bbdfa3d308ef517 (diff) | |
| download | git-4574f1aace4ca53ac0fc63a545383dab1a71fec9.tar.gz git-4574f1aace4ca53ac0fc63a545383dab1a71fec9.tar.xz | |
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 <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'submodule-config.c')
| -rw-r--r-- | submodule-config.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/submodule-config.c b/submodule-config.c index 388ef1f89..2ca3272dd 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); |