summaryrefslogtreecommitdiff
path: root/submodule.c
diff options
context:
space:
mode:
authorBrandon Williams <bmwill@google.com>2017-10-31 18:19:10 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-11-01 02:51:30 (GMT)
commitb2100e529171f0bbd497366618436cf86c08a324 (patch)
treec2369ba71d4f376463923d1af622a4ae15e2b18f /submodule.c
parent23dcf77f48feb49c54bad09210f093a799816334 (diff)
downloadgit-b2100e529171f0bbd497366618436cf86c08a324.zip
git-b2100e529171f0bbd497366618436cf86c08a324.tar.gz
git-b2100e529171f0bbd497366618436cf86c08a324.tar.bz2
diff: remove DIFF_OPT_CLR macro
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>
Diffstat (limited to 'submodule.c')
-rw-r--r--submodule.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/submodule.c b/submodule.c
index 7e79985..62a93bb 100644
--- a/submodule.c
+++ b/submodule.c
@@ -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;