add, reset: use DIFF_OPT_SET macro to set a diff flag

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