diff: remove DIFF_OPT_SET macro

diff --git a/builtin/reset.c b/builtin/reset.c
index ea2fad5a0f389e582dd99b9c230b989c339b7db6..206819ef153076cdbbe48deee53c41e5acadf26b 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;
-       DIFF_OPT_SET(&opt, OVERRIDE_SUBMODULE_CONFIG);
+       opt.flags.OVERRIDE_SUBMODULE_CONFIG = 1;
 
        if (do_diff_cache(tree_oid, &opt))
                return 1;