diff options
| author | Brandon Williams <bmwill@google.com> | 2017-10-31 21:19:09 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-01 05:50:03 +0300 |
| commit | 23dcf77f48feb49c54bad09210f093a799816334 (patch) | |
| tree | eff748e83bc0e1bf41b631d77d5c38f82a549ee5 /submodule.c | |
| parent | 3b69daed861daec1923c369d59c97e46eb3c3d7b (diff) | |
diff: remove DIFF_OPT_SET macro
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>
Diffstat (limited to 'submodule.c')
| -rw-r--r-- | submodule.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/submodule.c b/submodule.c index 58da9c668c..7e79985928 100644 --- a/submodule.c +++ b/submodule.c @@ -183,7 +183,7 @@ void set_diffopt_flags_from_submodule_config(struct diff_options *diffopt, if (ignore) handle_ignore_submodules_arg(diffopt, ignore); else if (is_gitmodules_unmerged(&the_index)) - DIFF_OPT_SET(diffopt, IGNORE_SUBMODULES); + diffopt->flags.IGNORE_SUBMODULES = 1; } } @@ -407,11 +407,11 @@ void handle_ignore_submodules_arg(struct diff_options *diffopt, DIFF_OPT_CLR(diffopt, IGNORE_DIRTY_SUBMODULES); if (!strcmp(arg, "all")) - DIFF_OPT_SET(diffopt, IGNORE_SUBMODULES); + diffopt->flags.IGNORE_SUBMODULES = 1; else if (!strcmp(arg, "untracked")) - DIFF_OPT_SET(diffopt, IGNORE_UNTRACKED_IN_SUBMODULES); + diffopt->flags.IGNORE_UNTRACKED_IN_SUBMODULES = 1; else if (!strcmp(arg, "dirty")) - DIFF_OPT_SET(diffopt, IGNORE_DIRTY_SUBMODULES); + diffopt->flags.IGNORE_DIRTY_SUBMODULES = 1; else if (strcmp(arg, "none")) die("bad --ignore-submodules argument: %s", arg); } |