summaryrefslogtreecommitdiff
path: root/builtin/reset.c
diff options
context:
space:
mode:
authorBrandon Williams <bmwill@google.com>2017-10-31 18:19:09 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-11-01 02:50:03 (GMT)
commit23dcf77f48feb49c54bad09210f093a799816334 (patch)
treeeff748e83bc0e1bf41b631d77d5c38f82a549ee5 /builtin/reset.c
parent3b69daed861daec1923c369d59c97e46eb3c3d7b (diff)
downloadgit-23dcf77f48feb49c54bad09210f093a799816334.zip
git-23dcf77f48feb49c54bad09210f093a799816334.tar.gz
git-23dcf77f48feb49c54bad09210f093a799816334.tar.bz2
diff: remove DIFF_OPT_SET macro
Remove the `DIFF_OPT_SET` macro and instead set the flags directly. This conversion is done using the following semantic patch: @@ expression E; identifier fld; @@ - DIFF_OPT_SET(&E, fld) + E.flags.fld = 1 @@ type T; T *ptr; identifier fld; @@ - DIFF_OPT_SET(ptr, fld) + ptr->flags.fld = 1 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 ea2fad5..206819e 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;
- DIFF_OPT_SET(&opt, OVERRIDE_SUBMODULE_CONFIG);
+ opt.flags.OVERRIDE_SUBMODULE_CONFIG = 1;
if (do_diff_cache(tree_oid, &opt))
return 1;