mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

diff: remove DIFF_OPT_CLR macro

Browse Source 
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>
This commit is contained in:
Brandon Williams
2017-10-31 11:19:10 -07:00
committed by Junio C Hamano
parent 23dcf77f48
commit b2100e5291
7 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
combine-diff.c
View File

@ -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
*