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

6
submodule.c
View File

@ -402,9 +402,9 @@ const char *submodule_strategy_to_string(const struct submodule_update_strategy
void handle_ignore_submodules_arg(struct diff_options *diffopt,
const char *arg)
{
DIFF_OPT_CLR(diffopt, IGNORE_SUBMODULES);
DIFF_OPT_CLR(diffopt, IGNORE_UNTRACKED_IN_SUBMODULES);
DIFF_OPT_CLR(diffopt, IGNORE_DIRTY_SUBMODULES);
diffopt->flags.IGNORE_SUBMODULES = 0;
diffopt->flags.IGNORE_UNTRACKED_IN_SUBMODULES = 0;
diffopt->flags.IGNORE_DIRTY_SUBMODULES = 0;
if (!strcmp(arg, "all"))
diffopt->flags.IGNORE_SUBMODULES = 1;