Merge branch 'cb/t4201-robustify'

diff --git a/builtin/reset.c b/builtin/reset.c
index d4003f76abcc5cbf469d3d5f029f328717508fa7..906e5416582301233cb275fb102a63cb6d1dd139 100644 (file)
--- a/builtin/reset.c
+++ b/builtin/reset.c
@@ -166,7 +166,7 @@ static int read_from_tree(const struct pathspec *pathspec,
        opt.output_format = DIFF_FORMAT_CALLBACK;
        opt.format_callback = update_index_from_diff;
        opt.format_callback_data = &intent_to_add;
-       opt.flags |= DIFF_OPT_OVERRIDE_SUBMODULE_CONFIG;
+       opt.flags.override_submodule_config = 1;
 
        if (do_diff_cache(tree_oid, &opt))
                return 1;