diff options
author | Brandon Williams <bmwill@google.com> | 2017-10-30 22:46:43 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-10-31 07:33:08 +0300 |
commit | c9f348e926d300c4e254299b92e9bfe1678512d6 (patch) | |
tree | d3ce0cffceb2723bb06554e7db7ebe872426102d /builtin/add.c | |
parent | 2f899857a9f425cb59f8a15c2ea7a52100c51a23 (diff) |
add, reset: use DIFF_OPT_SET macro to set a diff flag
Instead of explicitly setting the 'DIFF_OPT_OVERRIDE_SUBMODULE_CONFIG'
flag, use the 'DIFF_OPT_SET' macro.
Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/add.c')
-rw-r--r-- | builtin/add.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/add.c b/builtin/add.c index a648cf4c56..b70e8a779c 100644 --- a/builtin/add.c +++ b/builtin/add.c @@ -116,7 +116,7 @@ int add_files_to_cache(const char *prefix, rev.diffopt.output_format = DIFF_FORMAT_CALLBACK; rev.diffopt.format_callback = update_callback; rev.diffopt.format_callback_data = &data; - rev.diffopt.flags |= DIFF_OPT_OVERRIDE_SUBMODULE_CONFIG; + DIFF_OPT_SET(&rev.diffopt, OVERRIDE_SUBMODULE_CONFIG); rev.max_count = 0; /* do not compare unmerged paths with stage #2 */ run_diff_files(&rev, DIFF_RACY_IS_MODIFIED); clear_pathspec(&rev.prune_data); |