mirrors/git
1
0
Fork 0
Code Issues Pull Requests 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
builtin/diff.c
View File

@ -350,8 +350,8 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
rev.diffopt.stat_graph_width = -1;
/* Default to let external and textconv be used */
DIFF_OPT_SET(&rev.diffopt, ALLOW_EXTERNAL);
DIFF_OPT_SET(&rev.diffopt, ALLOW_TEXTCONV);
rev.diffopt.flags.ALLOW_EXTERNAL = 1;
rev.diffopt.flags.ALLOW_TEXTCONV = 1;
if (nongit)
die(_("Not a git repository"));
@ -361,7 +361,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
diff_setup_done(&rev.diffopt);
}
DIFF_OPT_SET(&rev.diffopt, RECURSIVE);
rev.diffopt.flags.RECURSIVE = 1;
setup_diff_pager(&rev.diffopt);