diff options
author | Brandon Williams <bmwill@google.com> | 2017-10-31 21:19:08 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-11-01 05:50:03 +0300 |
commit | 3b69daed861daec1923c369d59c97e46eb3c3d7b (patch) | |
tree | bc66d274c0b97aa27526320778387e557dc22dbe /revision.c | |
parent | 25567af8056d992c9a51815db4b3a3e9417a2969 (diff) |
diff: remove DIFF_OPT_TST macro
Remove the `DIFF_OPT_TST` macro and instead access the flags directly.
This conversion is done using the following semantic patch:
@@
expression E;
identifier fld;
@@
- DIFF_OPT_TST(&E, fld)
+ E.flags.fld
@@
type T;
T *ptr;
identifier fld;
@@
- DIFF_OPT_TST(ptr, fld)
+ ptr->flags.fld
Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'revision.c')
-rw-r--r-- | revision.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/revision.c b/revision.c index d167223e69..c893d9166b 100644 --- a/revision.c +++ b/revision.c @@ -2399,7 +2399,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s /* Pickaxe, diff-filter and rename following need diffs */ if (revs->diffopt.pickaxe || revs->diffopt.filter || - DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES)) + revs->diffopt.flags.FOLLOW_RENAMES) revs->diff = 1; if (revs->topo_order) @@ -2408,7 +2408,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s if (revs->prune_data.nr) { copy_pathspec(&revs->pruning.pathspec, &revs->prune_data); /* Can't prune commits with rename following: the paths change.. */ - if (!DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES)) + if (!revs->diffopt.flags.FOLLOW_RENAMES) revs->prune = 1; if (!revs->full_diff) copy_pathspec(&revs->diffopt.pathspec, |