summaryrefslogtreecommitdiff
path: root/builtin/reset.c
diff options
context:
space:
mode:
authorBrandon Williams <bmwill@google.com>2017-10-30 19:46:43 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-10-31 04:33:08 (GMT)
commitc9f348e926d300c4e254299b92e9bfe1678512d6 (patch)
treed3ce0cffceb2723bb06554e7db7ebe872426102d /builtin/reset.c
parent2f899857a9f425cb59f8a15c2ea7a52100c51a23 (diff)
downloadgit-c9f348e926d300c4e254299b92e9bfe1678512d6.zip
git-c9f348e926d300c4e254299b92e9bfe1678512d6.tar.gz
git-c9f348e926d300c4e254299b92e9bfe1678512d6.tar.bz2
add, reset: use DIFF_OPT_SET macro to set a diff flag
Instead of explicitly setting the 'DIFF_OPT_OVERRIDE_SUBMODULE_CONFIG' flag, use the 'DIFF_OPT_SET' macro. Signed-off-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/reset.c')
-rw-r--r--builtin/reset.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/reset.c b/builtin/reset.c
index 9cd89b2..ea2fad5 100644
--- 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;