diff options
| author | Brandon Williams <bmwill@google.com> | 2017-10-31 18:19:10 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-01 02:51:30 (GMT) |
| commit | b2100e529171f0bbd497366618436cf86c08a324 (patch) | |
| tree | c2369ba71d4f376463923d1af622a4ae15e2b18f /combine-diff.c | |
| parent | 23dcf77f48feb49c54bad09210f093a799816334 (diff) | |
| download | git-b2100e529171f0bbd497366618436cf86c08a324.zip git-b2100e529171f0bbd497366618436cf86c08a324.tar.gz git-b2100e529171f0bbd497366618436cf86c08a324.tar.bz2 | |
diff: remove DIFF_OPT_CLR macro
Remove the `DIFF_OPT_CLR` macro and instead set the flags directly.
This conversion is done using the following semantic patch:
@@
expression E;
identifier fld;
@@
- DIFF_OPT_CLR(&E, fld)
+ E.flags.fld = 0
@@
type T;
T *ptr;
identifier fld;
@@
- DIFF_OPT_CLR(ptr, fld)
+ ptr->flags.fld = 0
Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'combine-diff.c')
| -rw-r--r-- | combine-diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/combine-diff.c b/combine-diff.c index 204b0df..5a3a8b4 100644 --- a/combine-diff.c +++ b/combine-diff.c @@ -1414,7 +1414,7 @@ void diff_tree_combined(const struct object_id *oid, diffopts = *opt; copy_pathspec(&diffopts.pathspec, &opt->pathspec); diffopts.flags.RECURSIVE = 1; - DIFF_OPT_CLR(&diffopts, ALLOW_EXTERNAL); + diffopts.flags.ALLOW_EXTERNAL = 0; /* find set of paths that everybody touches * |