From: Junio C Hamano Date: Mon, 19 Sep 2022 21:35:24 +0000 (-0700) Subject: Merge branch 'jk/list-objects-filter-cleanup' X-Git-Tag: v2.38.0-rc1~16 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=298a9582249255fe00660a78dba0bb0ef0e1dbe8;p=thirdparty%2Fgit.git Merge branch 'jk/list-objects-filter-cleanup' A couple of bugfixes with code clean-up. * jk/list-objects-filter-cleanup: list-objects-filter: convert filter_spec to a strbuf list-objects-filter: add and use initializers list-objects-filter: handle null default filter spec list-objects-filter: don't memset after releasing filter struct --- 298a9582249255fe00660a78dba0bb0ef0e1dbe8 diff --cc builtin/submodule--helper.c index ad834f9ed5,f5dc63fab4..0b4acb442b --- a/builtin/submodule--helper.c +++ b/builtin/submodule--helper.c @@@ -1746,8 -1754,9 +1746,10 @@@ static int module_clone(int argc, cons { int dissociate = 0, quiet = 0, progress = 0, require_init = 0; struct module_clone_data clone_data = MODULE_CLONE_DATA_INIT; - struct list_objects_filter_options filter_options = { 0 }; + struct string_list reference = STRING_LIST_INIT_NODUP; + struct list_objects_filter_options filter_options = + LIST_OBJECTS_FILTER_INIT; + struct option module_clone_options[] = { OPT_STRING(0, "prefix", &clone_data.prefix, N_("path"), @@@ -2617,11 -2579,12 +2619,12 @@@ cleanup static int module_update(int argc, const char **argv, const char *prefix) { - struct pathspec pathspec; + struct pathspec pathspec = { 0 }; + struct pathspec pathspec2 = { 0 }; struct update_data opt = UPDATE_DATA_INIT; - struct list_objects_filter_options filter_options = { 0 }; + struct list_objects_filter_options filter_options = + LIST_OBJECTS_FILTER_INIT; int ret; - struct option module_update_options[] = { OPT__FORCE(&opt.force, N_("force checkout updates"), 0), OPT_BOOL(0, "init", &opt.init,