Merge branch 'jk/fsck-gitmodules-gently'
Recent "security fix" to pay attention to contents of ".gitmodules" while accepting "git push" was a bit overly strict than necessary, which has been adjusted. * jk/fsck-gitmodules-gently: fsck: downgrade gitmodulesParse default to "info" fsck: split ".gitmodules too large" error from parse failure fsck: silence stderr when parsing .gitmodules config: add options parameter to git_config_from_mem config: add CONFIG_ERROR_SILENT handler config: turn die_on_error into caller-facing enum
This commit is contained in:
@ -562,7 +562,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);
|
||||
|
||||
|
Reference in New Issue
Block a user