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
merge-recursive.c
View File

@ -541,7 +541,7 @@ static struct string_list *get_renames(struct merge_options *o,
diff_setup(&opts);
opts.flags.RECURSIVE = 1;
DIFF_OPT_CLR(&opts, RENAME_EMPTY);
opts.flags.RENAME_EMPTY = 0;
opts.detect_rename = DIFF_DETECT_RENAME;
opts.rename_limit = o->merge_rename_limit >= 0 ? o->merge_rename_limit :
o->diff_rename_limit >= 0 ? o->diff_rename_limit :