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 /config.h | |
parent | config: add CONFIG_ERROR_SILENT handler (diff) | |
download | tgif-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 'config.h')
-rw-r--r-- | config.h | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -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); |