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 /fsck.c | |
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 'fsck.c')
-rw-r--r-- | fsck.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1012,7 +1012,7 @@ static int fsck_blob(struct blob *blob, const char *buf, data.options = options; data.ret = 0; if (git_config_from_mem(fsck_gitmodules_fn, CONFIG_ORIGIN_BLOB, - ".gitmodules", buf, size, &data)) + ".gitmodules", buf, size, &data, NULL)) data.ret |= report(options, &blob->object, FSCK_MSG_GITMODULES_PARSE, "could not parse gitmodules blob"); |