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

diff: remove DIFF_OPT_SET macro

Browse Source 
Remove the `DIFF_OPT_SET` macro and instead set the flags directly.
This conversion is done using the following semantic patch:

	@@
	expression E;
	identifier fld;
	@@
	- DIFF_OPT_SET(&E, fld)
	+ E.flags.fld = 1

	@@
	type T;
	T *ptr;
	identifier fld;
	@@
	- DIFF_OPT_SET(ptr, fld)
	+ ptr->flags.fld = 1

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:09 -07:00
committed by Junio C Hamano
parent 3b69daed86
commit 23dcf77f48
20 changed files with 90 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
diff-no-index.c
View File

@@ -276,16 +276,16 @@ void diff_no_index(struct rev_info *revs,
if (!revs->diffopt.output_format)
revs->diffopt.output_format = DIFF_FORMAT_PATCH;
DIFF_OPT_SET(&revs->diffopt, NO_INDEX);
revs->diffopt.flags.NO_INDEX = 1;
DIFF_OPT_SET(&revs->diffopt, RELATIVE_NAME);
revs->diffopt.flags.RELATIVE_NAME = 1;
revs->diffopt.prefix = prefix;
revs->max_count = -2;
diff_setup_done(&revs->diffopt);
setup_diff_pager(&revs->diffopt);
DIFF_OPT_SET(&revs->diffopt, EXIT_WITH_STATUS);
revs->diffopt.flags.EXIT_WITH_STATUS = 1;
if (queue_diff(&revs->diffopt, paths[0], paths[1]))
exit(1);