diff options
author | Brandon Williams <bmwill@google.com> | 2017-10-31 19:19:09 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-11-01 03:50:03 +0100 |
commit | 23dcf77f48feb49c54bad09210f093a799816334 (patch) | |
tree | eff748e83bc0e1bf41b631d77d5c38f82a549ee5 /tree-diff.c | |
parent | diff: remove DIFF_OPT_TST macro (diff) | |
download | git-23dcf77f48feb49c54bad09210f093a799816334.tar.xz git-23dcf77f48feb49c54bad09210f093a799816334.zip |
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 'tree-diff.c')
-rw-r--r-- | tree-diff.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tree-diff.c b/tree-diff.c index ed0aa6a62c..b996a23bbf 100644 --- a/tree-diff.c +++ b/tree-diff.c @@ -608,8 +608,8 @@ static void try_to_follow_renames(const struct object_id *old_oid, q->nr = 0; diff_setup(&diff_opts); - DIFF_OPT_SET(&diff_opts, RECURSIVE); - DIFF_OPT_SET(&diff_opts, FIND_COPIES_HARDER); + diff_opts.flags.RECURSIVE = 1; + diff_opts.flags.FIND_COPIES_HARDER = 1; diff_opts.output_format = DIFF_FORMAT_NO_OUTPUT; diff_opts.single_follow = opt->pathspec.items[0].match; diff_opts.break_opt = opt->break_opt; |